linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 07/12] ext4: pass verify_reserved_gdb() the number of group decriptors
Date: Wed,  4 Jan 2012 00:07:29 -0500	[thread overview]
Message-ID: <1325653654-10478-8-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>

The 64bit resizer adds a flex group each time, so verify_reserved_gdb
can not use s_groups_count directly, it should use the number of group
decriptors before the added group.

Signed-off-by: Yongqiang Yang <xiaoqiangnk@gmail.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 fs/ext4/resize.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
index eb0aebc..12eace0 100644
--- a/fs/ext4/resize.c
+++ b/fs/ext4/resize.c
@@ -656,10 +656,10 @@ static unsigned ext4_list_backups(struct super_block *sb, unsigned *three,
  * groups in current filesystem that have BACKUPS, or -ve error code.
  */
 static int verify_reserved_gdb(struct super_block *sb,
+			       ext4_group_t end,
 			       struct buffer_head *primary)
 {
 	const ext4_fsblk_t blk = primary->b_blocknr;
-	const ext4_group_t end = EXT4_SB(sb)->s_groups_count;
 	unsigned three = 1;
 	unsigned five = 5;
 	unsigned seven = 7;
@@ -734,7 +734,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
 	if (!gdb_bh)
 		return -EIO;
 
-	gdbackups = verify_reserved_gdb(sb, gdb_bh);
+	gdbackups = verify_reserved_gdb(sb, group, gdb_bh);
 	if (gdbackups < 0) {
 		err = gdbackups;
 		goto exit_bh;
@@ -897,7 +897,8 @@ static int reserve_backup_gdb(handle_t *handle, struct inode *inode,
 			err = -EIO;
 			goto exit_bh;
 		}
-		if ((gdbackups = verify_reserved_gdb(sb, primary[res])) < 0) {
+		gdbackups = verify_reserved_gdb(sb, group, primary[res]);
+		if (gdbackups < 0) {
 			brelse(primary[res]);
 			err = gdbackups;
 			goto exit_bh;
-- 
1.7.8.11.gefc1f.dirty


  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 ` Theodore Ts'o [this message]
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 ` [PATCH V7 11/12] ext4: let ext4_group_extend() use common code Theodore Ts'o
2012-01-04  5:07 ` [PATCH V7 12/12] ext4: let ext4_group_add() " 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-8-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).