Merge tag 'mm-nonmm-stable-2023-11-02-14-08' of git://git.kernel.org/pub/scm/linux...

[linux.git] / fs / ocfs2 / alloc.c

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index f0937902f7b46e48d51b6dbcd0a46dc1ae5b569a..91b32b2377acc9336cbe03a5c7be2d4cfe4e9cda 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -967,7 +967,14 @@ int ocfs2_num_free_extents(struct ocfs2_extent_tree *et)
                el = &eb->h_list;
        }
 
-       BUG_ON(el->l_tree_depth != 0);
+       if (el->l_tree_depth != 0) {
+               retval = ocfs2_error(ocfs2_metadata_cache_get_super(et->et_ci),
+                               "Owner %llu has leaf extent block %llu with an invalid l_tree_depth of %u\n",
+                               (unsigned long long)ocfs2_metadata_cache_owner(et->et_ci),
+                               (unsigned long long)last_eb_blk,
+                               le16_to_cpu(el->l_tree_depth));
+               goto bail;
+       }
 
        retval = le16_to_cpu(el->l_count) - le16_to_cpu(el->l_next_free_rec);
 bail:
@@ -7642,7 +7649,7 @@ out_mutex:
                goto next_group;
        }
 out:
-       range->len = trimmed * sb->s_blocksize;
+       range->len = trimmed * osb->s_clustersize;
        return ret;
 }