The patch titled Subject: fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2 has been removed from the -mm tree. Its filename was fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2.patch This patch was dropped because it was folded into fat-fix-data-past-eof-resulting-from-fsx-testsuite.patch ------------------------------------------------------ From: Namjae Jeon <namjae.jeon@xxxxxxxxxxx> Subject: fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2 Signed-off-by: Namjae Jeon <namjae.jeon@xxxxxxxxxxx> Signed-off-by: Amit Sahrawat <a.sahrawat@xxxxxxxxxxx> Acked-by: OGAWA Hirofumi <hirofumi@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/fat/file.c | 5 +++-- fs/fat/inode.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff -puN fs/fat/file.c~fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2 fs/fat/file.c --- a/fs/fat/file.c~fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2 +++ a/fs/fat/file.c @@ -505,11 +505,12 @@ int fat_setattr(struct dentry *dentry, s } if (attr->ia_valid & ATTR_SIZE) { + error = fat_block_truncate_page(inode, attr->ia_size); + if (error) + goto out; down_write(&MSDOS_I(inode)->truncate_lock); truncate_setsize(inode, attr->ia_size); fat_truncate_blocks(inode, attr->ia_size); - if (inode->i_size & (inode->i_sb->s_blocksize - 1)) - fat_block_truncate_page(inode, inode->i_size); up_write(&MSDOS_I(inode)->truncate_lock); } diff -puN fs/fat/inode.c~fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2 fs/fat/inode.c --- a/fs/fat/inode.c~fat-fix-data-past-eof-resulting-from-fsx-testsuite-v2 +++ a/fs/fat/inode.c @@ -334,7 +334,7 @@ static sector_t _fat_bmap(struct address /* * fat_block_truncate_page() zeroes out a mapping from file offset `from' * up to the end of the block which corresponds to `from'. - * This is required during truncate to physically zero out the tail end + * This is required during truncate to physically zeroout the tail end * of that block so it doesn't yield old data if the file is later grown. * Also, avoid causing failure from fsx for cases of "data past EOF" */ _ Patches currently in -mm which might be from namjae.jeon@xxxxxxxxxxx are origin.patch fat-fix-data-past-eof-resulting-from-fsx-testsuite.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html