Added EA/ACL support in dump and restore.

[dump.git] / compat / include / bsdcompat.h

diff --git a/compat/include/bsdcompat.h b/compat/include/bsdcompat.h
index ce7d6538544999f99e5b8a8285908f107adc3851..7bc216038c96b34f9b0804e140a0cbe1699e4e72 100644 (file)
--- a/compat/include/bsdcompat.h
+++ b/compat/include/bsdcompat.h
@@ -5,12 +5,13 @@
  *     Stelian Pop <stelian@popies.net>, 1999-2000
  *     Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
  *
- *     $Id: bsdcompat.h,v 1.21 2003/11/22 16:52:16 stelian Exp $
+ *     $Id: bsdcompat.h,v 1.24 2005/05/02 15:10:45 stelian Exp $
  */
 
 #include <config.h>
 #include <sys/time.h>
 #include <dirent.h>
+#include <ext2fs/ext2fs.h>
 
 #define        __dead          volatile
 #define UNUSED(x)      x __attribute__ ((unused))
@@ -37,11 +38,17 @@
 #define UF_NODUMP      EXT2_NODUMP_FL
 #endif
 
+#ifndef howmany
 #define howmany(x,y)   (((x)+((y)-1))/(y))
+#endif
+#ifndef roundup
 #define roundup(x, y)  ((((x)+((y)-1))/(y))*(y))
+#endif
+#ifndef powerof2
 #define powerof2(x)    ((((x)-1)&(x))==0)
+#endif
 
-#define fsbtodb(sb,b)  ((int)(((long long)(b) * EXT2_BLOCK_SIZE((sb)->super)) / DEV_BSIZE))
+#define fsbtodb(sb,b)  ((ext2_loff_t)(((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
@@ -111,8 +118,8 @@ struct dinode {
        __u32   di_blocks;
        __u32   di_flags;
        __u32   di_reserved1;
-       daddr_t di_db[NDADDR];
-       daddr_t di_ib[NIADDR];
+       __u32   di_db[NDADDR];
+       __u32   di_ib[NIADDR];
        __u32   di_gen;
        __u32   di_file_acl;
        __u32   di_dir_acl;
@@ -123,6 +130,8 @@ struct dinode {
        __u16   di_uidhigh;
        __u16   di_gidhigh;
        __u32   di_spare;
+       __u16   di_extraisize;
+       __u16   di_pad2;
 };
 
 #define di_rdev                di_db[0]
@@ -242,8 +251,8 @@ struct old_bsd_inode {
                char    di_usymlink[MAXFASTLINK + 1];
        }               di_un;
 #else
-       daddr_t         di_db[NDADDR];
-       daddr_t         di_ib[NIADDR];
+       __u32           di_db[NDADDR];
+       __u32           di_ib[NIADDR];
 #endif
        __s32           di_flags;
        __s32           di_blocks;
@@ -271,8 +280,8 @@ struct new_bsd_inode {
        struct bsdtimeval       di_atime;
        struct bsdtimeval       di_mtime;
        struct bsdtimeval       di_ctime;
-       daddr_t         di_db[NDADDR];
-       daddr_t         di_ib[NIADDR];
+       __u32           di_db[NDADDR];
+       __u32           di_ib[NIADDR];
        __u32           di_flags;
        __s32           di_blocks;
        __s32           di_gen;