diff --git a/[refs] b/[refs]
index 1500d0cff1a2..d5bb1f0de34e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 955e47ad28b5b255ddcd7eb9cb814a269dc6e991
+refs/heads/master: 22de606a0b9623bf15752808f123848a65a6cc28
diff --git a/trunk/fs/xfs/xfs_itable.c b/trunk/fs/xfs/xfs_itable.c
index 0fbbd7b9c696..b9edbc65f364 100644
--- a/trunk/fs/xfs/xfs_itable.c
+++ b/trunk/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) {