[patch] patch for ext2fs1.42

dump-e2fs1.42.patch (text/plain), 1.68 KB, created by Thomas Pfaff on 2011-09-19 09:11:00 UTC

diff -urp dump-0.4b44.org/compat/include/bsdcompat.h dump-0.4b44/compat/include/bsdcompat.h
--- dump-0.4b44.org/compat/include/bsdcompat.h	2005-05-02 17:10:45.000000000 +0200
+++ dump-0.4b44/compat/include/bsdcompat.h	2011-09-19 10:47:24.067805926 +0200
@@ -52,7 +52,7 @@
 #define dbtofsb(sb,b)	((int)(((long long)(b) * DEV_BSIZE) / EXT2_BLOCK_SIZE((sb)->super)))
 
 #define	sblock		fs
-#define fs_fsize	fragsize
+#define fs_fsize	cluster_ratio_bits	
 #define fs_bsize	blocksize
 #define fs_size		super->s_blocks_count
 
diff -urp dump-0.4b44.org/dump/traverse.c dump-0.4b44/dump/traverse.c
--- dump-0.4b44.org/dump/traverse.c	2011-02-21 11:36:47.000000000 +0100
+++ dump-0.4b44/dump/traverse.c	2011-09-19 10:48:11.697289568 +0200
@@ -854,7 +854,7 @@ dump_xattr(dump_ino_t ino, struct dinode
 		spcl.c_dinode.di_size = sblock->fs_bsize;
 		spcl.c_flags |= DR_EXTATTRIBUTES;
 		spcl.c_extattributes = EXT_XATTR;
-		blksout(&dp->di_file_acl, EXT2_FRAGS_PER_BLOCK(fs->super), ino);
+		blksout(&dp->di_file_acl, EXT2_CLUSTER_SIZE(fs->super), ino);
 		spcl.c_flags &= ~DR_EXTATTRIBUTES;
 		spcl.c_extattributes = 0;
 	}
@@ -988,7 +988,7 @@ dumpino(struct dinode *dp, dump_ino_t in
 		return;
 	}
 #ifdef	__linux__
-	bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);
+	bc.max = NINDIR(sblock) * EXT2_CLUSTER_SIZE(fs->super);
 	bc.buf = (int *)malloc (bc.max * sizeof (int));
 	bc.cnt = 0;
 	bc.ino = ino;
@@ -1247,7 +1247,7 @@ dmpindir(dump_ino_t ino, daddr_t blk, in
 			cnt = howmany(*size, sblock->fs_fsize);
 		else
 #ifdef	__linux__
-			cnt = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);
+			cnt = NINDIR(sblock) * EXT2_CLUSTER_SIZE(fs->super);
 #else
 			cnt = NINDIR(sblock) * sblock->fs_frag;
 #endif