From: Ben Myers Date: Tue, 10 Dec 2013 20:53:52 +0000 (+0000) Subject: xfs_repair: fix process_bmbt_reclist_int X-Git-Tag: v3.2.0-rc1~81 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea4a8de1e135905e240a54f192daf23275a7e8a8;p=thirdparty%2Fxfsprogs-dev.git xfs_repair: fix process_bmbt_reclist_int There is a set checks for corruption in block map btrees in process_bmbt_reclist_int that we identify but currently do not fix. It appears that the author's intent in this function was to set error = 1, and then only clear it when all of the checks were completed successfully. Unfortunately error can be cleared when it is used for the return value of blkmap_set_ext. Some kinds of corruption are not being fixed, including duplicate extents, claiming free blocks, claiming metadata blocks, and multiply used blocks. Fix this by using error2 for the return code from blkmap_set_ext. Signed-off-by: Ben Myers Reviewed-by: Christoph Hellwig Signed-off-by: Rich Johnston --- diff --git a/repair/dinode.c b/repair/dinode.c index 7469fc816..3115bd0d6 100644 --- a/repair/dinode.c +++ b/repair/dinode.c @@ -651,9 +651,10 @@ _("inode %" PRIu64 " - extent offset too large - start %" PRIu64 ", " } if (blkmapp && *blkmapp) { - error = blkmap_set_ext(blkmapp, irec.br_startoff, + int error2; + error2 = blkmap_set_ext(blkmapp, irec.br_startoff, irec.br_startblock, irec.br_blockcount); - if (error) { + if (error2) { /* * we don't want to clear the inode due to an * internal bmap tracking error, but if we've @@ -665,7 +666,7 @@ _("inode %" PRIu64 " - extent offset too large - start %" PRIu64 ", " do_abort( _("Fatal error: inode %" PRIu64 " - blkmap_set_ext(): %s\n" "\t%s fork, off - %" PRIu64 ", start - %" PRIu64 ", cnt %" PRIu64 "\n"), - ino, strerror(error), forkname, + ino, strerror(error2), forkname, irec.br_startoff, irec.br_startblock, irec.br_blockcount); }