Skip to contentSkip to conversation

ext4: don't leave i_crtime.tv_sec uninitialized

PATCH In review Theodore Ts'o 2 participants 2 messages Feb 17, 2014 ext4 file system

lore
Share & tools
lore

Theodore Ts'o

author maintainer
#0 lore raw

PATCH 1/1 ext4: don't leave i_crtime.tv_sec uninitialized

If the i_crtime field is not present in the inode, don't leave the field uninitialized.

---
 fs/ext4/ext4.h | 2 ++
 1 file changed, 2 insertions(+)
fs/ext4/ext4.h +2 -0
index ece5556..d3a534f 100644
@@ -771,6 +771,8 @@ do {									       \
 	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))		       \
 		(einode)->xtime.tv_sec = 				       \
 			(signed)le32_to_cpu((raw_inode)->xtime);	       \
+	else								       \
+		(einode)->xtime.tv_sec = 0;				       \
 	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))	       \
 		ext4_decode_extra_time(&(einode)->xtime,		       \
 				       raw_inode->xtime ## _extra);	       \
Signature · 1 line
1.9.0
#1 lore raw
Quoted 15 lines · Theodore Ts'o

If the i_crtime field is not present in the inode, don't leave the field uninitialized.

---
  fs/ext4/ext4.h | 2 ++
  1 file changed, 2 insertions(+)
fs/ext4/ext4.h +0 -0
index ece5556..d3a534f 100644

fs/ext4/ext4.h do { \ · line 778

Quoted 8 lines
fs/ext4/ext4.h +2 -0
@@ -771,6 +771,8 @@ do {									       \
  	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime))		       \
  		(einode)->xtime.tv_sec = 				       \
  			(signed)le32_to_cpu((raw_inode)->xtime);	       \
+	else								       \
+		(einode)->xtime.tv_sec = 0;				       \
  	if (EXT4_FITS_IN_INODE(raw_inode, einode, xtime ## _extra))	       \
  		ext4_decode_extra_time(&(einode)->xtime,		       \
  				       raw_inode->xtime ## _extra);	       \

This fixes everything for me, thanks!

Vegard