X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=compat%2Finclude%2Fbsdcompat.h;h=8b8737877ef8605b02d7a40093f8d6353e62a75e;hp=881f50582b725fb65987aa08e0b7b58483740751;hb=9ca70cf6a082bb146eaaa0b09361643feca38875;hpb=11856e771fadee7ddb9b5a613c91f562bf363da7

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index 881f505..8b87378 100644
--- a/compat/include/bsdcompat.h
+++ b/compat/include/bsdcompat.h
@@ -5,7 +5,7 @@
  *	Stelian Pop <stelian@popies.net>, 1999-2000
  *	Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *	$Id: bsdcompat.h,v 1.16 2002/01/16 09:32:14 stelian Exp $
+ *	$Id: bsdcompat.h,v 1.18 2002/07/17 10:18:52 stelian Exp $
  */
 
 #include <config.h>
@@ -36,7 +36,8 @@
 #define powerof2(x)	((((x)-1)&(x))==0)
 
 #define dbtob(b)	((unsigned)(b) << DEV_BSHIFT)
-#define fsbtodb(sb,b)	((int)(((long long)b * EXT2_BLOCK_SIZE(sb->super)) / DEV_BSIZE))
+#define fsbtodb(sb,b)	((int)(((long long)(b) * EXT2_BLOCK_SIZE((sb)->super)) / DEV_BSIZE))
+#define dbtofsb(sb,b)	((int)(((long long)(b) * DEV_BSIZE) / EXT2_BLOCK_SIZE((sb)->super)))
 
 #define	sblock		fs
 #define fs_fsize	fragsize
@@ -95,7 +96,9 @@ struct dinode {
 	__u8	di_frag;
 	__u8	di_fsize;
 	__u16	di_pad1;
-	__u32	di_spare[2];
+	__u16	di_uidhigh;
+	__u16	di_gidhigh;
+	__u32	di_spare;
 };
 
 #define di_rdev		di_db[0]
@@ -133,21 +136,7 @@ struct dinode {
 #endif
 
 /*
- * This is the direct structure used by dump. In needs to be
- * different from direct because linux dump generates only
- * 'old inode format' dumps. And BSD supposes that the old
- * inode dumps have the d_namelen field written in machine byte
- * order...
- */
-struct olddirect {
-	__u32	d_ino;
-	__u16	d_reclen;
-	__u16	d_namlen;
-	char	d_name[MAXNAMLEN + 1];
-};
-
-/*
- * The direct structure used by restore.
+ * The direct structure used by dump/restore.
  */
 struct direct {
 	__u32	d_ino;