Attachment #286991 for bug #381835

View | Details | Raw Unified | Return to bug 381835
Collapse All | Expand All

Lines 52-58 Link Here

(-)dump-0.4b44.org/compat/include/bsdcompat.h (-1 / +1 lines)
52	#define dbtofsb(sb,b) ((int)(((long long)(b) * DEV_BSIZE) / EXT2_BLOCK_SIZE((sb)->super)))	52	#define dbtofsb(sb,b) ((int)(((long long)(b) * DEV_BSIZE) / EXT2_BLOCK_SIZE((sb)->super)))
53		53
54	#define sblock fs	54	#define sblock fs
55	#define fs_fsize fragsize	55	#define fs_fsize cluster_ratio_bits
56	#define fs_bsize blocksize	56	#define fs_bsize blocksize
57	#define fs_size super->s_blocks_count	57	#define fs_size super->s_blocks_count
58		58




		spcl.c_dinode.di_size = sblock->fs_bsize;
		spcl.c_flags |= DR_EXTATTRIBUTES;
		spcl.c_extattributes = EXT_XATTR;
		blksout(&dp->di_file_acl, EXT2_CLUSTER_SIZE(fs->super), ino);
		spcl.c_flags &= ~DR_EXTATTRIBUTES;
		spcl.c_extattributes = 0;
	}

		return;
	}
#ifdef	__linux__
	bc.max = NINDIR(sblock) * EXT2_CLUSTER_SIZE(fs->super);
	bc.buf = (int *)malloc (bc.max * sizeof (int));
	bc.cnt = 0;
	bc.ino = ino;

			cnt = howmany(*size, sblock->fs_fsize);
		else
#ifdef	__linux__
			cnt = NINDIR(sblock) * EXT2_CLUSTER_SIZE(fs->super);
#else
			cnt = NINDIR(sblock) * sblock->fs_frag;
#endif

Return to bug 381835

Lines 854-860 dump_xattr(dump_ino_t ino, struct dinode Link Here

(-)dump-0.4b44.org/dump/traverse.c (-3 / +3 lines)
854	spcl.c_dinode.di_size = sblock->fs_bsize;	854	spcl.c_dinode.di_size = sblock->fs_bsize;
855	spcl.c_flags \|= DR_EXTATTRIBUTES;	855	spcl.c_flags \|= DR_EXTATTRIBUTES;
856	spcl.c_extattributes = EXT_XATTR;	856	spcl.c_extattributes = EXT_XATTR;
857	blksout(&dp->di_file_acl, EXT2_FRAGS_PER_BLOCK(fs->super), ino);	857	blksout(&dp->di_file_acl, EXT2_CLUSTER_SIZE(fs->super), ino);
858	spcl.c_flags &= ~DR_EXTATTRIBUTES;	858	spcl.c_flags &= ~DR_EXTATTRIBUTES;
859	spcl.c_extattributes = 0;	859	spcl.c_extattributes = 0;
860	}	860	}
Lines 988-994 dumpino(struct dinode *dp, dump_ino_t in Link Here
988	return;	988	return;
989	}	989	}
990	#ifdef __linux__	990	#ifdef __linux__
991	bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);	991	bc.max = NINDIR(sblock) * EXT2_CLUSTER_SIZE(fs->super);
992	bc.buf = (int )malloc (bc.max sizeof (int));	992	bc.buf = (int )malloc (bc.max sizeof (int));
993	bc.cnt = 0;	993	bc.cnt = 0;
994	bc.ino = ino;	994	bc.ino = ino;
Lines 1247-1253 dmpindir(dump_ino_t ino, daddr_t blk, in Link Here
1247	cnt = howmany(*size, sblock->fs_fsize);	1247	cnt = howmany(*size, sblock->fs_fsize);
1248	else	1248	else
1249	#ifdef __linux__	1249	#ifdef __linux__
1250	cnt = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);	1250	cnt = NINDIR(sblock) * EXT2_CLUSTER_SIZE(fs->super);
1251	#else	1251	#else
1252	cnt = NINDIR(sblock) * sblock->fs_frag;	1252	cnt = NINDIR(sblock) * sblock->fs_frag;
1253	#endif	1253	#endif