1 files changed, 5 insertions, 0 deletions

diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index 0fbbd7b9c696..b9edbc65f364 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) {