From: Vlad Apostolov <vapo@sgi.com>
Date: Thu, 28 Sep 2006 01:04:24 +0000 (+1000)
Subject: [XFS] pv 955157, rv bnaujok - break the loop on formatter() error
X-Git-Tag: v2.6.19-rc1~653^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22de606a0b9623bf15752808f123848a65a6cc28;p=linux-2.6

[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 0fbbd7b9c6..b9edbc65f3 100644
--- 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) {