1 files changed, 6 insertions, 3 deletions

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index c59450e1be40..94068d014f27 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -272,7 +272,7 @@ xfs_bulkstat(
         size_t                  statstruct_size, /* sizeof struct filling */
         char                    __user *ubuffer, /* buffer with inode stats */
         int                     flags,  /* defined in xfs_itable.h */
-        int                     *done)  /* 1 if there're more stats to get */
+        int                     *done)  /* 1 if there are more stats to get */
 {
         xfs_agblock_t           agbno=0;/* allocation group block number */
         xfs_buf_t               *agbp;  /* agi header buffer */
@@ -562,7 +562,8 @@ xfs_bulkstat(
                                                 if (bp)
                                                         xfs_buf_relse(bp);
                                                 error = xfs_itobp(mp, NULL, ip,
-                                                                  &dip, &bp, bno);
+                                                                &dip, &bp, bno,
+                                                                XFS_IMAP_BULKSTAT);
                                                 if (!error)
                                                         clustidx = ip->i_boffset / mp->m_sb.sb_inodesize;
                                                 kmem_zone_free(xfs_inode_zone, ip);
@@ -570,6 +571,8 @@ xfs_bulkstat(
                                                                    mp, XFS_ERRTAG_BULKSTAT_READ_CHUNK,
                                                                    XFS_RANDOM_BULKSTAT_READ_CHUNK)) {
                                                         bp = NULL;
+                                                        ubleft = 0;
+                                                        rval = error;
                                                         break;
                                                 }
                                         }
@@ -673,7 +676,7 @@ xfs_bulkstat_single(
         xfs_mount_t             *mp,    /* mount point for filesystem */
         xfs_ino_t               *lastinop, /* inode to return */
         char                    __user *buffer, /* buffer with inode stats */
-        int                     *done)  /* 1 if there're more stats to get */
+        int                     *done)  /* 1 if there are more stats to get */
 {
         int                     count;  /* count value for bulkstat call */
         int                     error;  /* return value */