From 14450dc78dcf7af8be86c7f60dbf2aa695806993 Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 13 Sep 2012 20:29:02 -0600 Subject: [PATCH] --- yaml --- r: 332569 b: refs/heads/master c: ebb3dad4353b94c12a5cffab4397727c19f088e5 h: refs/heads/master i: 332567: b7bb3e161b853b43b0bdf4453e66888eb9446bd8 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/free-space-cache.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a36a2fb748bc..e9d68cca3796 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1bcea35597693b3ac1ec1b311cfd42d52972a710 +refs/heads/master: ebb3dad4353b94c12a5cffab4397727c19f088e5 diff --git a/trunk/fs/btrfs/free-space-cache.c b/trunk/fs/btrfs/free-space-cache.c index 6b10acfc2f5c..b107e68797f4 100644 --- a/trunk/fs/btrfs/free-space-cache.c +++ b/trunk/fs/btrfs/free-space-cache.c @@ -1454,9 +1454,7 @@ static int search_bitmap(struct btrfs_free_space_ctl *ctl, max_t(u64, *offset, bitmap_info->offset)); bits = bytes_to_bits(*bytes, ctl->unit); - for (i = find_next_bit(bitmap_info->bitmap, BITS_PER_BITMAP, i); - i < BITS_PER_BITMAP; - i = find_next_bit(bitmap_info->bitmap, BITS_PER_BITMAP, i + 1)) { + for_each_set_bit_from(i, bitmap_info->bitmap, BITS_PER_BITMAP) { next_zero = find_next_zero_bit(bitmap_info->bitmap, BITS_PER_BITMAP, i); if ((next_zero - i) >= bits) { @@ -2307,9 +2305,7 @@ static int btrfs_bitmap_cluster(struct btrfs_block_group_cache *block_group, again: found_bits = 0; - for (i = find_next_bit(entry->bitmap, BITS_PER_BITMAP, i); - i < BITS_PER_BITMAP; - i = find_next_bit(entry->bitmap, BITS_PER_BITMAP, i + 1)) { + for_each_set_bit_from(i, entry->bitmap, BITS_PER_BITMAP) { next_zero = find_next_zero_bit(entry->bitmap, BITS_PER_BITMAP, i); if (next_zero - i >= min_bits) {