diff --git a/[refs] b/[refs]
index d5bb1f0de34e..2695a0f83667 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22de606a0b9623bf15752808f123848a65a6cc28
+refs/heads/master: e132f54ce8660bbf34723cc12cb11e6f61d6fbac
diff --git a/trunk/fs/xfs/xfs_itable.c b/trunk/fs/xfs/xfs_itable.c
index b9edbc65f364..e338d6cf0273 100644
--- a/trunk/fs/xfs/xfs_itable.c
+++ b/trunk/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) {