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/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -984,7 +984,7 @@ xfs_file_fallocate(

 		iattr.ia_valid = ATTR_SIZE;
 		iattr.ia_size = new_size;
-		error = xfs_setattr_size(ip, &iattr);
+		error = xfs_vn_setattr_size(file_dentry(file), &iattr);
 		if (error)
 			goto out_unlock;
 	}