[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>

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 80e5b96f5027f8b7f378e822678c9b0d65741551..7775ddc0b3c6b105449bef21a3954741533129f4 100644 (file)
--- 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) {