aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs/xfs_ioctl.c
diff options
context:
space:
mode:
authorDave Chinner <david@fromorbit.com>2014-08-04 13:54:46 +1000
committerDave Chinner <david@fromorbit.com>2014-08-04 13:54:46 +1000
commitb076d8720d793cde04b75b4941b8774e209649b4 (patch)
tree14f0aa5ac5850e2077076062340eb1ef15f7ccf1 /fs/xfs/xfs_ioctl.c
parentMerge branch 'xfs-misc-fixes-3.17-1' into for-next (diff)
parentxfs: introduce xfs_bulkstat_ag_ichunk (diff)
downloadlinux-dev-b076d8720d793cde04b75b4941b8774e209649b4.tar.xz
linux-dev-b076d8720d793cde04b75b4941b8774e209649b4.zip
Merge branch 'xfs-bulkstat-refactor' 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 30983b8ceaa1..494237ed4a65 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -796,8 +796,8 @@ xfs_ioc_bulkstat(
error = xfs_inumbers(mp, &inlast, &count,
bulkreq.ubuffer, xfs_inumbers_fmt);
else if (cmd == XFS_IOC_FSBULKSTAT_SINGLE)
- error = xfs_bulkstat_single(mp, &inlast,
- bulkreq.ubuffer, &done);
+ error = xfs_bulkstat_one(mp, inlast, bulkreq.ubuffer,
+ sizeof(xfs_bstat_t), NULL, &done);
else /* XFS_IOC_FSBULKSTAT */
error = xfs_bulkstat(mp, &inlast, &count, xfs_bulkstat_one,
sizeof(xfs_bstat_t), bulkreq.ubuffer,