Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757626Ab1FAOgX (ORCPT ); Wed, 1 Jun 2011 10:36:23 -0400 Received: from mail-px0-f179.google.com ([209.85.212.179]:59503 "EHLO mail-px0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756871Ab1FAOgS (ORCPT ); Wed, 1 Jun 2011 10:36:18 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=HCBaLUruM0NHT0HtIjuGXEwwDrNkivLsIwBosMEqQG3nTy8jabNwsBAvbfQLpajO8S wE4FHx7aHBIXffktQr+ofQAtKFmDp2GQsqJbSyB1OAwyMndOFKKXG2Cg/d/hwC6NVK8V qQuDQ7iQy0DCi/knLQXmmsx+Vqs5Xp8ikmx1k= From: Akinobu Mita To: linux-kernel@vger.kernel.org Cc: Akinobu Mita , "Theodore Ts'o" , Andreas Dilger , linux-ext4@vger.kernel.org Subject: [PATCH v2 2/2] ext4: use proper ext4_*_bit() macros Date: Wed, 1 Jun 2011 23:36:49 +0900 Message-Id: <1306939009-11283-2-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1306939009-11283-1-git-send-email-akinobu.mita@gmail.com> References: <1306939009-11283-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5019 Lines: 141 Using ext4_test_and_{set,clear}_bit() with ignoring its return value can be replaced with ext4_{set,clear}_bit(). Signed-off-by: Akinobu Mita Cc: "Theodore Ts'o" Cc: Andreas Dilger Cc: linux-ext4@vger.kernel.org --- v2: rewritten to keep ext4_*_bit() macros fs/ext4/balloc.c | 8 ++++---- fs/ext4/ialloc.c | 2 +- fs/ext4/mballoc.c | 4 ++-- fs/ext4/resize.c | 12 ++++++------ 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c index b6747e4..264f694 100644 --- a/fs/ext4/balloc.c +++ b/fs/ext4/balloc.c @@ -144,7 +144,7 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, int flex_bg = 0; for (bit = 0; bit < bit_max; bit++) - ext4_test_and_set_bit(bit, bh->b_data); + ext4_set_bit(bit, bh->b_data); start = ext4_group_first_block_no(sb, block_group); @@ -155,18 +155,18 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, /* Set bits for block and inode bitmaps, and inode table */ tmp = ext4_block_bitmap(sb, gdp); if (!flex_bg || ext4_block_in_group(sb, tmp, block_group)) - ext4_test_and_set_bit(tmp - start, bh->b_data); + ext4_set_bit(tmp - start, bh->b_data); tmp = ext4_inode_bitmap(sb, gdp); if (!flex_bg || ext4_block_in_group(sb, tmp, block_group)) - ext4_test_and_set_bit(tmp - start, bh->b_data); + ext4_set_bit(tmp - start, bh->b_data); tmp = ext4_inode_table(sb, gdp); for (; tmp < ext4_inode_table(sb, gdp) + sbi->s_itb_per_group; tmp++) { if (!flex_bg || ext4_block_in_group(sb, tmp, block_group)) - ext4_test_and_set_bit(tmp - start, bh->b_data); + ext4_set_bit(tmp - start, bh->b_data); } /* * Also if the number of blocks within the group is diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 90bef6b..096da8a 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c @@ -59,7 +59,7 @@ void ext4_mark_bitmap_end(int start_bit, int end_bit, char *bitmap) ext4_debug("mark end bits +%d through +%d used\n", start_bit, end_bit); for (i = start_bit; i < ((start_bit + 7) & ~7UL); i++) - ext4_test_and_set_bit(i, bitmap); + ext4_set_bit(i, bitmap); if (i < end_bit) memset(bitmap + (i >> 3), 0xff, (end_bit - i) >> 3); } diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c index b423adf..859f2ae 100644 --- a/fs/ext4/mballoc.c +++ b/fs/ext4/mballoc.c @@ -384,13 +384,13 @@ static inline int mb_test_bit(int bit, void *addr) static inline void mb_set_bit(int bit, void *addr) { addr = mb_correct_addr_and_bit(&bit, addr); - ext4_test_and_set_bit(bit, addr); + ext4_set_bit(bit, addr); } static inline void mb_clear_bit(int bit, void *addr) { addr = mb_correct_addr_and_bit(&bit, addr); - ext4_test_and_clear_bit(bit, addr); + ext4_clear_bit(bit, addr); } static inline int mb_find_next_zero_bit(void *addr, int max, int start) diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index cc40963..80bbc9c 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c @@ -194,7 +194,7 @@ static int setup_new_group_blocks(struct super_block *sb, if (ext4_bg_has_super(sb, input->group)) { ext4_debug("mark backup superblock %#04llx (+0)\n", start); - ext4_test_and_set_bit(0, bh->b_data); + ext4_set_bit(0, bh->b_data); } /* Copy all of the GDT blocks into the backup in this group */ @@ -225,7 +225,7 @@ static int setup_new_group_blocks(struct super_block *sb, brelse(gdb); goto exit_bh; } - ext4_test_and_set_bit(bit, bh->b_data); + ext4_set_bit(bit, bh->b_data); brelse(gdb); } @@ -237,14 +237,14 @@ static int setup_new_group_blocks(struct super_block *sb, if (err) goto exit_bh; for (i = 0, bit = gdblocks + 1; i < reserved_gdb; i++, bit++) - ext4_test_and_set_bit(bit, bh->b_data); + ext4_set_bit(bit, bh->b_data); ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap, input->block_bitmap - start); - ext4_test_and_set_bit(input->block_bitmap - start, bh->b_data); + ext4_set_bit(input->block_bitmap - start, bh->b_data); ext4_debug("mark inode bitmap %#04llx (+%llu)\n", input->inode_bitmap, input->inode_bitmap - start); - ext4_test_and_set_bit(input->inode_bitmap - start, bh->b_data); + ext4_set_bit(input->inode_bitmap - start, bh->b_data); /* Zero out all of the inode table blocks */ block = input->inode_table; @@ -255,7 +255,7 @@ static int setup_new_group_blocks(struct super_block *sb, goto exit_bh; for (i = 0, bit = input->inode_table - start; i < sbi->s_itb_per_group; i++, bit++) - ext4_test_and_set_bit(bit, bh->b_data); + ext4_set_bit(bit, bh->b_data); if ((err = extend_or_restart_transaction(handle, 2, bh))) goto exit_bh; -- 1.7.4.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/