From 1c608c2d1aefca2bf63497663e17cfb49e6b022c Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 30 Nov 2016 23:13:05 +0000 Subject: 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 --- fs/hfs/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'fs/hfs') 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; -- cgit v1.2.3