mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
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
This commit is contained in:
commit
9c41180be4
2 changed files with 15 additions and 8 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue