diff options
author | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:46 +1000 |
---|---|---|
committer | Dave Chinner <david@fromorbit.com> | 2014-08-04 13:54:46 +1000 |
commit | b076d8720d793cde04b75b4941b8774e209649b4 (patch) | |
tree | 14f0aa5ac5850e2077076062340eb1ef15f7ccf1 /fs/xfs/xfs_ioctl.c | |
parent | 4d7eece2c0dad832c5f224629eba3cced3f2d6cd (diff) | |
parent | 1e773c4989d2dfe08332b4c18f7e1d7ad633015c (diff) | |
download | linux-stable-b076d8720d793cde04b75b4941b8774e209649b4.tar.gz linux-stable-b076d8720d793cde04b75b4941b8774e209649b4.tar.bz2 linux-stable-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.c | 4 |
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, |