[XFS] 955947: Infinite loop in xfs_bulkstat() on formatter() error

SGI-PV: 955947
SGI-Modid: xfs-linux-melb:xfs-kern:26986a

Signed-off-by: Vlad Apostolov <vapo@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 80e5b96f5027..7775ddc0b3c6 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -647,6 +647,8 @@ xfs_bulkstat(
                                         }
                                         else if (error == ENOMEM)
                                                 ubleft = 0;
+                                        else
+                                                lastino = ino;
                                         continue;
                                 }
                                 if (fmterror == BULKSTAT_RV_GIVEUP) {