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

2016-10-08 11:06:08 -04:00
parent f334bcd94b 030b533c4f
commit e55f1d1d13
76 changed files with 296 additions and 225 deletions
--- a/fs/orangefs/inode.c
+++ b/fs/orangefs/inode.c
@@ -219,7 +219,7 @@ int orangefs_setattr(struct dentry *dentry, struct iattr *iattr)
 		     "orangefs_setattr: called on %pd\n",
 		     dentry);

-	ret = inode_change_ok(inode, iattr);
+	ret = setattr_prepare(dentry, iattr);
 	if (ret)
 		goto out;