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

Darrick J. Wong
2014-05-01T23:13:14Z

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(-)

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);