From: Theodore Ts'o <tytso@mit.edu>
To: Ext4 Developers List <linux-ext4@vger.kernel.org>
Cc: Yongqiang Yang <xiaoqiangnk@gmail.com>, "Theodore Ts'o" <tytso@mit.edu>
Subject: [PATCH V7 11/12] ext4: let ext4_group_extend() use common code
Date: Wed, 4 Jan 2012 00:07:33 -0500 [thread overview]
Message-ID: <1325653654-10478-12-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1325653654-10478-1-git-send-email-tytso@mit.edu>
From: Yongqiang Yang <xiaoqiangnk@gmail.com>
ext4_group_extend_no_check() is moved out from ext4_group_extend(),
this patch lets ext4_group_extend() call ext4_group_extentd_no_check()
instead.
Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/resize.c | 41 ++---------------------------------------
1 files changed, 2 insertions(+), 39 deletions(-)
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index 5fe2a01..eba706d 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -1795,8 +1795,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
ext4_grpblk_t last;
ext4_grpblk_t add;
struct buffer_head *bh;
- handle_t *handle;
- int err, err2;
+ int err;
ext4_group_t group;
o_blocks_count = ext4_blocks_count(es);
@@ -1852,43 +1851,7 @@ int ext4_group_extend(struct super_block *sb, struct ext4_super_block *es,
}
brelse(bh);
- /* We will update the superblock, one block bitmap, and
- * one group descriptor via ext4_free_blocks().
- */
- handle = ext4_journal_start_sb(sb, 3);
- if (IS_ERR(handle)) {
- err = PTR_ERR(handle);
- ext4_warning(sb, "error %d on journal start", err);
- goto exit_put;
- }
-
- if ((err = ext4_journal_get_write_access(handle,
- EXT4_SB(sb)->s_sbh))) {
- ext4_warning(sb, "error %d on journal write access", err);
- ext4_journal_stop(handle);
- goto exit_put;
- }
- ext4_blocks_count_set(es, o_blocks_count + add);
- ext4_debug("freeing blocks %llu through %llu\n", o_blocks_count,
- o_blocks_count + add);
- /* We add the blocks to the bitmap and set the group need init bit */
- err = ext4_group_add_blocks(handle, sb, o_blocks_count, add);
- ext4_handle_dirty_super(handle, sb);
- ext4_debug("freed blocks %llu through %llu\n", o_blocks_count,
- o_blocks_count + add);
- err2 = ext4_journal_stop(handle);
- if (!err && err2)
- err = err2;
-
- if (err)
- goto exit_put;
next prev parent reply other threads:[~2012-01-04 5:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-04 5:07 [PATCH V7 00/12] Add new online resize (Ted's modified version) Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 01/12] ext4: add a function which extends a group without checking parameters Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 02/12] ext4: add a function which adds a new group descriptors to a fs Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 03/12] ext4: add a structure which will be used by 64bit-resize interface Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 04/12] ext4: add a function which sets up group blocks of a flex bg Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 05/12] ext4: add a function which sets up a block group descriptors " Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 06/12] ext4: add a function which updates the super block during online resizing Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 07/12] ext4: pass verify_reserved_gdb() the number of group decriptors Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 08/12] ext4: add a new function which allocates bitmaps and inode tables Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 09/12] ext4: add a new function which adds a flex group to a fs Theodore Ts'o
2012-01-04 5:07 ` [PATCH V7 10/12] ext4: add new online resize interface Theodore Ts'o
2012-01-04 5:07 ` Theodore Ts'o [this message]
2012-01-04 5:07 ` [PATCH V7 12/12] ext4: let ext4_group_add() use common code Theodore Ts'o
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=1325653654-10478-12-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-ext4@vger.kernel.org \
--cc=xiaoqiangnk@gmail.com \
/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).