Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next

2015-02-10 09:24:25 +11:00
parent 179073620d e9892d3cc8
commit bad962662d
5 changed files with 14 additions and 6 deletions
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1086,7 +1086,7 @@ out_cancel:
 *    to half the AG size to avoid alignment extending the extent beyond the
 *    limits of the AG.
 */
-int
+static int
 xfs_ioctl_setattr_check_extsize(
 	struct xfs_inode	*ip,
 	struct fsxattr		*fa)
@@ -1129,7 +1129,7 @@ xfs_ioctl_setattr_check_extsize(
 	return 0;
 }

-int
+static int
 xfs_ioctl_setattr_check_projid(
 	struct xfs_inode	*ip,
 	struct fsxattr		*fa)