summaryrefslogtreecommitdiff
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-11-30 18:38:47 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2017-11-30 18:38:47 -0500
commit9c41180be47a6c08105894e1289182995749fc9a (patch)
treee623a0c416b3c25f9f0a277c063e985539ad33be /fs/reiserfs
parent9e0600f5cf6cecfcab5046d1453a9538c054d8a7 (diff)
parent88bc0ede8d35edc969350852894dc864a2dc1859 (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull quota & reiserfs changes from Jan Kara: - two error checking improvements for quota - remove bogus i_version increase for reiserfs * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: quota: Check for register_shrinker() failure. quota: propagate error from __dquot_initialize reiserfs: remove unneeded i_version bump
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/super.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 020c9cacbb2f..1fc934d24459 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -2591,7 +2591,6 @@ out:
return err;
if (inode->i_size < off + len - towrite)
i_size_write(inode, off + len - towrite);
- inode->i_version++;
inode->i_mtime = inode->i_ctime = current_time(inode);
mark_inode_dirty(inode);
return len - towrite;