From c0ec30bc9fe14872c0a8facc570ff2050be15c4d Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Thu, 23 Jul 2009 08:12:58 +0800 Subject: [PATCH] --- yaml --- r: 156707 b: refs/heads/master c: 82e12644cf5227dab15201fbcaf0ca6330ebd70f h: refs/heads/master i: 156705: a75e072fa8ccadf248d790fad3604216f3804135 156703: 4a921ec696569ff0de0df85a820261c74d9328d7 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/alloc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5882a4e3f408..9f9c0408d86a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7b1aa69be138ad9d7d3f31fa56f4c9407f56b6a +refs/heads/master: 82e12644cf5227dab15201fbcaf0ca6330ebd70f diff --git a/trunk/fs/ocfs2/alloc.c b/trunk/fs/ocfs2/alloc.c index 11085af71247..f9a3e8942669 100644 --- a/trunk/fs/ocfs2/alloc.c +++ b/trunk/fs/ocfs2/alloc.c @@ -1914,7 +1914,8 @@ static void ocfs2_adjust_adjacent_records(struct ocfs2_extent_rec *left_rec, * immediately to their right. */ left_clusters = le32_to_cpu(right_child_el->l_recs[0].e_cpos); - if (ocfs2_is_empty_extent(&right_child_el->l_recs[0])) { + if (!ocfs2_rec_clusters(right_child_el, &right_child_el->l_recs[0])) { + BUG_ON(right_child_el->l_tree_depth); BUG_ON(le16_to_cpu(right_child_el->l_next_free_rec) <= 1); left_clusters = le32_to_cpu(right_child_el->l_recs[1].e_cpos); }