summaryrefslogtreecommitdiff
path: root/fs/btrfs
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2016-12-01 02:13:05 +0300
committerBen Hutchings <ben@decadent.org.uk>2017-02-23 06:53:52 +0300
commit1c608c2d1aefca2bf63497663e17cfb49e6b022c (patch)
treee14850fa49be1d6b71a51aea6b26dc26f90c96d7 /fs/btrfs
parent34a0362f84457031a9252c7ffc30263c9cc00bf9 (diff)
downloadlinux-1c608c2d1aefca2bf63497663e17cfb49e6b022c.tar.xz
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/btrfs')
-rw-r--r--fs/btrfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 4292500ef241..a09ec5e7f3e2 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -4690,7 +4690,7 @@ static int btrfs_setattr(struct dentry *dentry, struct iattr *attr)
if (btrfs_root_readonly(root))
return -EROFS;
- err = setattr_prepare(dentry, attr);
+ err = inode_change_ok(inode, attr);
if (err)
return err;