summaryrefslogtreecommitdiffstats
path: root/fs/hfs
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2016-11-30 23:13:05 +0000
committerBen Hutchings <ben@decadent.org.uk>2017-02-23 03:53:52 +0000
commit1c608c2d1aefca2bf63497663e17cfb49e6b022c (patch)
treee14850fa49be1d6b71a51aea6b26dc26f90c96d7 /fs/hfs
parent34a0362f84457031a9252c7ffc30263c9cc00bf9 (diff)
downloadlinux-stable-1c608c2d1aefca2bf63497663e17cfb49e6b022c.tar.gz
linux-stable-1c608c2d1aefca2bf63497663e17cfb49e6b022c.tar.bz2
linux-stable-1c608c2d1aefca2bf63497663e17cfb49e6b022c.zip
Revert "fs: Give dentry to inode_change_ok() instead of inode"
This reverts commit be9df699432235753c3824b0f5a27d46de7fdc9e, which was commit 31051c85b5e2aaaf6315f74c72a732673632a905 upstream. The backport breaks fuse and makes a mess of xfs, which can be improved by picking further upstream commits as I should have done in the first place. Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'fs/hfs')
-rw-r--r--fs/hfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index a4a3f8a674b9..d0929bc81782 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -604,7 +604,7 @@ int hfs_inode_setattr(struct dentry *dentry, struct iattr * attr)
struct hfs_sb_info *hsb = HFS_SB(inode->i_sb);
int error;
- error = setattr_prepare(dentry, attr); /* basic permission checks */
+ error = inode_change_ok(inode, attr); /* basic permission checks */
if (error)
return error;