From d42359e4c758a0574c285f2140e5da181e3d5da1 Mon Sep 17 00:00:00 2001 From: Yongqiang Yang Date: Tue, 3 Jan 2012 23:43:39 -0500 Subject: [PATCH] --- yaml --- r: 282973 b: refs/heads/master c: c72df9f928efd5b17e84bdb7b8ec1be3b9c1ea9d h: refs/heads/master i: 282971: b2c0502050bd1d87b497ee75e9214ddc6821bfd8 v: v3 --- [refs] | 2 +- trunk/fs/ext4/resize.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ca9e7e695a1a..703e8c657551 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e10e2f2e5a800a54ad2f16dfdd8c034e005958b +refs/heads/master: c72df9f928efd5b17e84bdb7b8ec1be3b9c1ea9d diff --git a/trunk/fs/ext4/resize.c b/trunk/fs/ext4/resize.c index eb0aebcca55f..12eace096546 100644 --- a/trunk/fs/ext4/resize.c +++ b/trunk/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;