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/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -53,7 +53,7 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr)
 	 * inode_newsize_ok() will always check against MAX_LFS_FILESIZE and not
 	 * check for a swapfile (which this won't be anyway).
 	 */
-	err = inode_change_ok(dentry->d_inode, attr);
+	err = setattr_prepare(dentry, attr);
 	if (err)
 		return err;