[XFS] pv 955157, rv bnaujok - break the loop on formatter() error

SGI-PV: 955157
SGI-Modid: xfs-linux-melb:xfs-kern:26866a

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 0fbbd7b9c696f5be8956f63a268cd7336ca50e0c..b9edbc65f3645d986655e3665e9b9012b41c29bf 100644 (file)
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -637,6 +637,11 @@ xfs_bulkstat(
                                if (fmterror == BULKSTAT_RV_NOTHING) {
                                        if (error == ENOMEM)
                                                ubleft = 0;
+                                        else if (error) {
+                                                ubleft = 0;
+                                                rval = error;
+                                                break;
+                                        }
                                        continue;
                                }
                                if (fmterror == BULKSTAT_RV_GIVEUP) {