diff mbox

[07/37] resize2fs: fix check for collision between old GDT and superblock on sparse_super2 fs

Message ID 20140501231308.31890.72322.stgit@birch.djwong.org
State Accepted, archived
Headers show

Commit Message

Darrick Wong May 1, 2014, 11:13 p.m. UTC 
In reserve_sparse_super2_last_group, the old_desc check should only be
performed if ext2fs_super_and_bgd_loc2() gave us a location -- a
return value of 0 means that there is no old-style GDT block.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 resize/resize2fs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Theodore Ts'o May 12, 2014, 3:35 a.m. UTC | #1 
On Thu, May 01, 2014 at 04:13:08PM -0700, Darrick J. Wong wrote:
> In reserve_sparse_super2_last_group, the old_desc check should only be
> performed if ext2fs_super_and_bgd_loc2() gave us a location -- a
> return value of 0 means that there is no old-style GDT block.
> 
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

Thanks, applied.

					- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index f5f1337..a81a1c3 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -2121,7 +2121,7 @@  static errcode_t reserve_sparse_super2_last_group(ext2_resize_t rfs,
 		      stderr);
 		exit(1);
 	}
-	if (old_desc != sb+1) {
+	if (old_desc && old_desc != sb+1) {
 		fputs(_("Should never happen!  Unexpected old_desc in "
 			"super_sparse bg?\n"),
 		      stderr);