Fix incorrect hole handling.

diff --git a/CHANGES b/CHANGES
index c3ac8f8eb132447e7ab2dbe33241f924c4d2804e..2f8cdc6ce642836a80cf471c2969eba8a4cd5166 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.319 2010/12/06 14:26:50 stelian Exp $
+$Id: CHANGES,v 1.320 2011/02/21 10:36:47 stelian Exp $

 
 
 Changes between versions 0.4b43 and 0.4b44 (released ?????????????)
 
 
 Changes between versions 0.4b43 and 0.4b44 (released ?????????????)


@@ -14,6 +14,10 @@ Changes between versions 0.4b43 and 0.4b44 (released ?????????????)
        volumes and are starting on 2nd tape or later (RedHat
        bug #507948).
 
        volumes and are starting on 2nd tape or later (RedHat
        bug #507948).
 

+3.     Fix a bug in dump when dumping files with holes. This bug
+       was introduced in 0.4b42 while adding ext4 support.
+       (Sourceforge bug #3133762).
+

 Changes between versions 0.4b42 and 0.4b43 (released June 11, 2010)
 ===================================================================
 
 Changes between versions 0.4b42 and 0.4b43 (released June 11, 2010)
 ===================================================================
 

diff --git a/dump/traverse.c b/dump/traverse.c
index 6ed1d287f3d572cbb7ec7f08cc4538ba9f36bc9e..34be0ec9115bb8ddc369dac0c2bab5976c5af978 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-       "$Id: traverse.c,v 1.71 2010/06/10 12:17:35 stelian Exp $";
+       "$Id: traverse.c,v 1.72 2011/02/21 10:36:47 stelian Exp $";

 #endif /* not lint */
 
 #include <config.h>
 #endif /* not lint */
 
 #include <config.h>


@@ -992,7 +992,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
        bc.buf = (int *)malloc (bc.max * sizeof (int));
        bc.cnt = 0;
        bc.ino = ino;
        bc.buf = (int *)malloc (bc.max * sizeof (int));
        bc.cnt = 0;
        bc.ino = ino;

-       bc.next_block = NDADDR;
+       bc.next_block = 0;

 
        ext2fs_block_iterate2(fs, (ext2_ino_t)ino, BLOCK_FLAG_DATA_ONLY, NULL, dumponeblock, (void *)&bc);
        /* deal with holes at the end of the inode */
 
        ext2fs_block_iterate2(fs, (ext2_ino_t)ino, BLOCK_FLAG_DATA_ONLY, NULL, dumponeblock, (void *)&bc);
        /* deal with holes at the end of the inode */