From: Yongqiang Yang <xiaoqiangnk@gmail.com>
To: linux-ext4@vger.kernel.org
Cc: aedilger@gmail.com, Yongqiang Yang <xiaoqiangnk@gmail.com>
Subject: [PATCH 08/12] ext4: let setup_new_group_blocks set multi-bits each time
Date: Mon, 18 Jul 2011 10:52:31 +0800 [thread overview]
Message-ID: <1310957555-15617-9-git-send-email-xiaoqiangnk@gmail.com> (raw)
In-Reply-To: <1310957555-15617-1-git-send-email-xiaoqiangnk@gmail.com>
This patch adds a function - ext4_set_btis() which can set multi-bits
each time, and lets setup_new_group_blocks() use ext4_set_bits().
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
---
fs/ext4/ext4.h | 1 +
fs/ext4/mballoc.c | 5 +++++
fs/ext4/resize.c | 18 +++++++-----------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index da7ab48..43e7448 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -940,6 +940,7 @@ struct ext4_inode_info {
#define ext4_find_next_zero_bit find_next_zero_bit_le
#define ext4_find_next_bit find_next_bit_le
+extern void ext4_set_bits(void *bm, int cur, int len);
/*
* Maximal mount counts between two filesystem checks
*/
diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index a2af35b..971137d 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -1299,6 +1299,11 @@ static void mb_set_bits(void *bm, int cur, int len)
}
}
+void ext4_set_bits(void *bm, int cur, int len)
+{
+ mb_set_bits(bm, cur, len);
+}
+
static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
int first, int count)
{
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 4089642..c91653c 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -227,11 +227,6 @@ static int setup_new_group_blocks(struct super_block *sb,
goto exit_journal;
}
- if (ext4_bg_has_super(sb, input->group)) {
- ext4_debug("mark backup superblock %#04llx (+0)\n", start);
- ext4_set_bit(0, bh->b_data);
- }
-
/* Copy all of the GDT blocks into the backup in this group */
for (i = 0, bit = 1, block = start + 1;
i < gdblocks; i++, block++, bit++) {
@@ -260,7 +255,6 @@ static int setup_new_group_blocks(struct super_block *sb,
brelse(gdb);
goto exit_bh;
}
- ext4_set_bit(bit, bh->b_data);
brelse(gdb);
}
@@ -271,8 +265,11 @@ static int setup_new_group_blocks(struct super_block *sb,
GFP_NOFS);
if (err)
goto exit_bh;
- for (i = 0, bit = gdblocks + 1; i < reserved_gdb; i++, bit++)
- ext4_set_bit(bit, bh->b_data);
+
+ if (ext4_bg_has_super(sb, input->group)) {
+ ext4_debug("mark backup group tables %#04llx (+0)\n", start);
+ ext4_set_bits(bh->b_data, 0, gdblocks + reserved_gdb + 1);
+ }
ext4_debug("mark block bitmap %#04llx (+%llu)\n", input->block_bitmap,
input->block_bitmap - start);
@@ -288,9 +285,8 @@ static int setup_new_group_blocks(struct super_block *sb,
err = sb_issue_zeroout(sb, block, sbi->s_itb_per_group, GFP_NOFS);
if (err)
goto exit_bh;
- for (i = 0, bit = input->inode_table - start;
- i < sbi->s_itb_per_group; i++, bit++)
- ext4_set_bit(bit, bh->b_data);
+ ext4_set_bits(bh->b_data, input->inode_table - start,
+ sbi->s_itb_per_group);
if ((err = extend_or_restart_transaction(handle, 2, bh)))
goto exit_bh;
--
1.7.5.1
next prev parent reply other threads:[~2011-07-18 2:57 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-18 2:52 prevent parallel resizers and fix some error handling in resize Yongqiang Yang
2011-07-18 2:52 ` [PATCH 01/12] ext4: prevent parallel resizers by atomic bit ops Yongqiang Yang
2011-07-18 2:52 ` [PATCH 02/12] ext4: prevent a fs with errors from being resized Yongqiang Yang
2011-07-18 2:52 ` [PATCH 03/12] ext4: prevent a fs without journal " Yongqiang Yang
2011-07-18 3:17 ` Tao Ma
2011-07-18 3:28 ` Yongqiang Yang
2011-07-18 3:44 ` Yongqiang Yang
2011-07-18 7:00 ` Andreas Dilger
2011-07-18 2:52 ` [PATCH 04/12] ext4: rename ext4_add_groupblocks() to ext4_group_add_blocks() Yongqiang Yang
2011-07-18 6:32 ` Amir Goldstein
2011-07-18 10:15 ` Yongqiang Yang
2011-07-18 2:52 ` [PATCH 05/12] ext4: let ext4_group_add_blocks return an error code Yongqiang Yang
2011-07-18 6:19 ` Andreas Dilger
2011-07-18 6:47 ` Amir Goldstein
2011-07-18 6:48 ` Amir Goldstein
2011-07-18 12:55 ` Yongqiang Yang
2011-07-18 2:52 ` [PATCH 06/12] ext4: let ext4_group_add_blocks() handle 0 blocks quickly Yongqiang Yang
2011-07-18 2:52 ` [PATCH 07/12] ext4: fix a typo in ext4_group_extend() Yongqiang Yang
2011-07-18 2:52 ` Yongqiang Yang [this message]
2011-07-18 6:26 ` [PATCH 08/12] ext4: let setup_new_group_blocks set multi-bits each time Andreas Dilger
2011-07-18 6:56 ` Amir Goldstein
2011-07-18 2:52 ` [PATCH 09/12] ext4: simplify journal handling in ext4_setup_new_group_blocks Yongqiang Yang
2011-07-18 3:09 ` Tao Ma
2011-07-18 3:21 ` Yongqiang Yang
2011-07-18 3:40 ` Tao Ma
2011-07-18 3:46 ` Yongqiang Yang
2011-07-18 2:52 ` [PATCH 10/12] ext4: remove lock_buffer in bclean() and setup_new_group_blocks Yongqiang Yang
2011-07-18 2:52 ` [PATCH 11/12] ext4: simplify parameters of add_new_gdb() Yongqiang Yang
2011-07-18 6:46 ` Andreas Dilger
2011-07-18 2:52 ` [PATCH 12/12] ext4: simplify parameters of reserve_backup_gdb() Yongqiang Yang
2011-07-18 7:12 ` Amir Goldstein
2011-07-18 6:16 ` prevent parallel resizers and fix some error handling in resize Amir Goldstein
2011-07-18 10:16 ` Yongqiang Yang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1310957555-15617-9-git-send-email-xiaoqiangnk@gmail.com \
--to=xiaoqiangnk@gmail.com \
--cc=aedilger@gmail.com \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).