From 209ec01d5d1f97d4c9f8e228625ea44230bf257f Mon Sep 17 00:00:00 2001 From: Robin Dong Date: Wed, 26 Oct 2011 05:30:30 -0400 Subject: [PATCH] --- yaml --- r: 273160 b: refs/heads/master c: b051d8dc4e1f011e1b0543a875f5861be5d90222 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/ext4/mballoc.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 74a3a6f63170..54937ee0a100 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66a83cde47deb4e8874539326e12e88ed82158d3 +refs/heads/master: b051d8dc4e1f011e1b0543a875f5861be5d90222 diff --git a/trunk/fs/ext4/mballoc.c b/trunk/fs/ext4/mballoc.c index c66531d800b1..2bb1ddc5c30b 100644 --- a/trunk/fs/ext4/mballoc.c +++ b/trunk/fs/ext4/mballoc.c @@ -1391,7 +1391,6 @@ static int mb_find_extent(struct ext4_buddy *e4b, int order, int block, { int next = block; int max; - int ord; void *buddy; assert_spin_locked(ext4_group_lock_ptr(e4b->bd_sb, e4b->bd_group)); @@ -1433,9 +1432,8 @@ static int mb_find_extent(struct ext4_buddy *e4b, int order, int block, if (mb_test_bit(next, EXT4_MB_BITMAP(e4b))) break; - ord = mb_find_order_for_block(e4b, next); + order = mb_find_order_for_block(e4b, next); - order = ord; block = next >> order; ex->fe_len += 1 << order; }