1 files changed, 8 insertions, 12 deletions

diff --git a/fs/xfs/linux-2.6/xfs_ioctl.c b/fs/xfs/linux-2.6/xfs_ioctl.c
index 2b34bad48b0..98a56568bb2 100644
--- a/fs/xfs/linux-2.6/xfs_ioctl.c
+++ b/fs/xfs/linux-2.6/xfs_ioctl.c
@@ -1047,24 +1047,20 @@ xfs_ioc_bulkstat(
         if ((count = bulkreq.icount) <= 0)
                 return -XFS_ERROR(EINVAL);
 
+        if (bulkreq.ubuffer == NULL)
+                return -XFS_ERROR(EINVAL);
+
         if (cmd == XFS_IOC_FSINUMBERS)
                 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);
-        else {  /* XFS_IOC_FSBULKSTAT */
-                if (count == 1 && inlast != 0) {
-                        inlast++;
-                        error = xfs_bulkstat_single(mp, &inlast,
-                                        bulkreq.ubuffer, &done);
-                } else {
-                        error = xfs_bulkstat(mp, &inlast, &count,
-                                (bulkstat_one_pf)xfs_bulkstat_one, NULL,
-                                sizeof(xfs_bstat_t), bulkreq.ubuffer,
-                                BULKSTAT_FG_QUICK, &done);
-                }
-        }
+        else    /* XFS_IOC_FSBULKSTAT */
+                error = xfs_bulkstat(mp, &inlast, &count,
+                        (bulkstat_one_pf)xfs_bulkstat_one, NULL,
+                        sizeof(xfs_bstat_t), bulkreq.ubuffer,
+                        BULKSTAT_FG_QUICK, &done);
 
         if (error)
                 return -error;