e2fsck: copy badblocks when copying fs

This patch copies badblocks when the copying fs.

E2fsprogs-commit: 8095b716e15bb15a47925ae02cb1c06e91fdb651

Change-Id: Ibf5718ad5851a9ccd853a2a1f928bce447aa5de9
Signed-off-by: Li Xi <lixi@ddn.com>
Signed-off-by: Wang Shilong <wshilong@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index ccf32fa..1c5177b 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -2157,6 +2157,12 @@ static errcode_t e2fsck_pass1_copy_fs(ext2_filsys dest, ext2_filsys src)
                        return retval;
        }
 
+       if (src->badblocks) {
+               retval = ext2fs_badblocks_copy(src->badblocks, &dest->badblocks);
+               if (retval)
+                       return retval;
+       }
+
        /* icache will be rebuilt if needed, so do not copy from @src */
        src->icache = NULL;
        return 0;
@@ -2189,6 +2195,13 @@ static int e2fsck_pass1_merge_fs(ext2_filsys dest, ext2_filsys src)
                src->icache = NULL;
        }
 
+       if (src->badblocks) {
+               retval = ext2fs_badblocks_copy(src->badblocks, &dest->badblocks);
+
+               ext2fs_badblocks_list_free(src->badblocks);
+               src->badblocks = NULL;
+       }
+
        return retval;
 }