e2image: fix logic bug which could cause a raw image not to be extended

If the size of the last "hole" in the raw file was an exact multiple
of a megabyte, then we wouldn't write a null at the end of the file in
order to extend the size of the raw image to correspond with the file
system size.  Thanks to Lukas Czerner for suggesting the fix, and
Phillip Susi for pointing out the problem.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/misc/e2image.c b/misc/e2image.c
index d888e5aee1231c61b3a94c7ab3594acc1260a934..3cb92fee27763ac56c970c5a15d4ef3faff5a1a3 100644 (file)
--- a/misc/e2image.c
+++ b/misc/e2image.c
@@ -504,10 +504,9 @@ static void output_meta_data_blocks(ext2_filsys fs, int fd)
                                continue;
                        }
                        sparse += fs->blocksize;
-                       if (sparse >= 1024*1024) {
-
-                               write_block(fd, 0, sparse, 0, 0);
-                               sparse = 0;
+                       if (sparse > 1024*1024) {
+                               write_block(fd, 0, 1024*1024, 0, 0);
+                               sparse -= 1024*1024;
                        }
                }
        }