Skip to contentSkip to conversation

e2fck: don't complain about i_size for known blocks past EOF

PATCH Applied Eric Sandeen 2 participants 2 messages Jan 19, 2010 – Feb 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e2fck: don't complain about i_size for known blocks past EOF

This is the userspace side of Jiaying's EOFBLOCKS patch, I think. With Aneesh's patches for .33, Jiaying's patch, and this one, xfstests 013/fsstress (even with direct IO enabled) has held up through many runs.

---

e2fsck/pass1.c +2 -1
index 09ff1d0..0a2c6cb 100644
@@ -1947,7 +1947,8 @@ static void check_blocks(e2fsck_t ctx, struct problem_context *pctx,
 		    /* allow allocated blocks to end of PAGE_SIZE */
 		    (size < (__u64)pb.last_block * fs->blocksize) &&
 		    (pb.last_block / blkpg * blkpg != pb.last_block ||
-		     size < (__u64)(pb.last_block & ~(blkpg-1)) *fs->blocksize))
+		     size < (__u64)(pb.last_block & ~(blkpg-1)) *fs->blocksize) &&
+		    !(inode->i_flags & EXT4_EOFBLOCKS_FL))
 			bad_size = 3;
 		else if (!(extent_fs && (inode->i_flags & EXT4_EXTENTS_FL)) &&
 			 size > ext2_max_sizes[fs->super->s_log_block_size])
lib/ext2fs/ext2_fs.h +3 -2
index 114b001..6e31c0d 100644
@@ -276,10 +276,11 @@ struct ext2_dx_countlimit {
 #define EXT2_TOPDIR_FL			0x00020000 /* Top of directory hierarchies*/
 #define EXT4_HUGE_FILE_FL               0x00040000 /* Set to each huge file */
 #define EXT4_EXTENTS_FL 		0x00080000 /* Inode uses extents */
+#define EXT4_EOFBLOCKS_FL		0x00400000 /* Blocks allocated beyond EOF */
 #define EXT2_RESERVED_FL		0x80000000 /* reserved for ext2 lib */
 
-#define EXT2_FL_USER_VISIBLE		0x000BDFFF /* User visible flags */
-#define EXT2_FL_USER_MODIFIABLE		0x000080FF /* User modifiable flags */
+#define EXT2_FL_USER_VISIBLE		0x004BDFFF /* User visible flags */
+#define EXT2_FL_USER_MODIFIABLE		0x004B80FF /* User modifiable flags */
 
 /*
  * ioctl commands
#1 lore raw
Quoted 6 lines · Eric Sandeen

This is the userspace side of Jiaying's EOFBLOCKS patch, I think. With Aneesh's patches for .33, Jiaying's patch, and this one, xfstests 013/fsstress (even with direct IO enabled) has held up through many runs.

Applied into the maint branch.

- Ted