diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2016-10-08 11:06:08 -0400 |
commit | e55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch) | |
tree | 406a3c127abb008f2f736c8d2ee03fc3c2926d6b /mm | |
parent | f334bcd94b7d3c0fbc34d518a86548f451ab5faf (diff) | |
parent | 030b533c4fd4d2ec3402363323de4bb2983c9cee (diff) | |
download | linux-stable-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.gz linux-stable-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.bz2 linux-stable-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.zip |
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'mm')
-rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 971fc83e6402..898a6f224187 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -960,7 +960,7 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr) struct shmem_sb_info *sbinfo = SHMEM_SB(inode->i_sb); int error; - error = inode_change_ok(inode, attr); + error = setattr_prepare(dentry, attr); if (error) return error; |