Merge remote-tracking branch 'jk/vfs' into work.misc

This commit is contained in:
Al Viro
2016-10-08 11:06:08 -04:00
76 changed files with 296 additions and 225 deletions

View File

@@ -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. */