summaryrefslogtreecommitdiffstats
path: root/fs/kernfs
diff options
context:
space:
mode:
authorAl Viro2016-10-08 17:06:08 +0200
committerAl Viro2016-10-08 17:06:08 +0200
commite55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch)
tree406a3c127abb008f2f736c8d2ee03fc3c2926d6b /fs/kernfs
parentMerge remote-tracking branch 'ovl/misc' into work.misc (diff)
parentfs: Avoid premature clearing of capabilities (diff)
downloadkernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.gz
kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.xz
kernel-qcow2-linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.zip
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'fs/kernfs')
-rw-r--r--fs/kernfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/kernfs/inode.c b/fs/kernfs/inode.c
index 63b925d5ba1e..df21f5b75549 100644
--- a/fs/kernfs/inode.c
+++ b/fs/kernfs/inode.c
@@ -122,7 +122,7 @@ int kernfs_iop_setattr(struct dentry *dentry, struct iattr *iattr)
return -EINVAL;
mutex_lock(&kernfs_mutex);
- error = inode_change_ok(inode, iattr);
+ error = setattr_prepare(dentry, iattr);
if (error)
goto out;