aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_ioctl.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2015-02-10 09:24:25 +1100
committerDave Chinner <david@fromorbit.com>2015-02-10 09:24:25 +1100
commitbad962662dbc60e76ec1baae34af56b1ba2dfa5f (patch)
treebf6d56e8658ab5eceb6edec34d4f205f4217d23b /fs/xfs/xfs_ioctl.c
parentMerge branch 'xfs-ioctl-setattr-cleanup' into for-next (diff)
parentxfs: only trace buffer items if they exist (diff)
downloadlinux-dev-bad962662dbc60e76ec1baae34af56b1ba2dfa5f.tar.xz
linux-dev-bad962662dbc60e76ec1baae34af56b1ba2dfa5f.zip
Merge branch 'xfs-misc-fixes-for-3.20-4' into for-next
Diffstat (limited to 'fs/xfs/xfs_ioctl.c')
-rw-r--r--fs/xfs/xfs_ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index b88ab927debe..f7afb86c9148 100644
--- 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)