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

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

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

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 b9edbc65f3..e338d6cf02 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -635,13 +635,13 @@ xfs_bulkstat(
 						ubleft, private_data,
 						bno, &ubused, dip, &fmterror);
 				if (fmterror == BULKSTAT_RV_NOTHING) {
-					if (error == ENOMEM)
-						ubleft = 0;
-                                        else if (error) {
+                                        if (error == EFAULT) {
                                                 ubleft = 0;
                                                 rval = error;
                                                 break;
                                         }
+					else if (error == ENOMEM)
+						ubleft = 0;
 					continue;
 				}
 				if (fmterror == BULKSTAT_RV_GIVEUP) {