diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2016-11-30 23:13:05 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2017-02-23 03:53:52 +0000 |
| commit | 1c608c2d1aefca2bf63497663e17cfb49e6b022c (patch) | |
| tree | e14850fa49be1d6b71a51aea6b26dc26f90c96d7 /mm | |
| parent | 34a0362f84457031a9252c7ffc30263c9cc00bf9 (diff) | |
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 '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 efab7a79b05f..a2b87affdc23 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -540,7 +540,7 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr) struct inode *inode = dentry->d_inode; int error; - error = setattr_prepare(dentry, attr); + error = inode_change_ok(inode, attr); if (error) return error; |