summaryrefslogtreecommitdiffstats
path: root/fs/ntfs
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-10-08 17:06:08 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2016-10-08 17:06:08 +0200
commite55f1d1d13e7f1c364672d667d78fd1f640ab9f9 (patch)
tree406a3c127abb008f2f736c8d2ee03fc3c2926d6b /fs/ntfs
parentMerge remote-tracking branch 'ovl/misc' into work.misc (diff)
parentfs: Avoid premature clearing of capabilities (diff)
downloadlinux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.tar.xz
linux-e55f1d1d13e7f1c364672d667d78fd1f640ab9f9.zip
Merge remote-tracking branch 'jk/vfs' into work.misc
Diffstat (limited to 'fs/ntfs')
-rw-r--r--fs/ntfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c
index e01287c964a8..9d7a44872df5 100644
--- a/fs/ntfs/inode.c
+++ b/fs/ntfs/inode.c
@@ -2893,7 +2893,7 @@ int ntfs_setattr(struct dentry *dentry, struct iattr *attr)
int err;
unsigned int ia_valid = attr->ia_valid;
- err = inode_change_ok(vi, attr);
+ err = setattr_prepare(dentry, attr);
if (err)
goto out;
/* We do not support NTFS ACLs yet. */