aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2013-11-19 10:17:07 -0500
committerBen Myers <bpm@sgi.com>2013-12-05 17:36:21 -0500
commitdff6efc326a4d5f305797d4a6bba14f374fdd633 (patch)
treec0370871b238354313a3809b8911d7f633ed0c3a /fs/ext4
parentb7d961b35b3ab69609aeea93f870269cb6e7ba4d (diff)
fs: fix iversion handling
Currently notify_change directly updates i_version for size updates, which not only is counter to how all other fields are updated through struct iattr, but also breaks XFS, which need inode updates to happen under its own lock, and synchronized to the structure that gets written to the log. Remove the update in the common code, and it to btrfs and ext4, XFS already does a proper updaste internally and currently gets a double update with the existing code. IMHO this is 3.13 and -stable material and should go in through the XFS tree. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Andreas Dilger <adilger@dilger.ca> Acked-by: Jan Kara <jack@suse.cz> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Chris Mason <clm@fb.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/inode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 075763474118..7f0e15ebacd9 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4598,6 +4598,10 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
4598 if (attr->ia_size > sbi->s_bitmap_maxbytes) 4598 if (attr->ia_size > sbi->s_bitmap_maxbytes)
4599 return -EFBIG; 4599 return -EFBIG;
4600 } 4600 }
4601
4602 if (IS_I_VERSION(inode) && attr->ia_size != inode->i_size)
4603 inode_inc_iversion(inode);
4604
4601 if (S_ISREG(inode->i_mode) && 4605 if (S_ISREG(inode->i_mode) &&
4602 (attr->ia_size < inode->i_size)) { 4606 (attr->ia_size < inode->i_size)) {
4603 if (ext4_should_order_data(inode)) { 4607 if (ext4_should_order_data(inode)) {