From 91d304df0ed29af98c653cbe23faf68c01a6d05b Mon Sep 17 00:00:00 2001 From: kalpak Date: Tue, 20 Jan 2009 04:57:11 +0000 Subject: [PATCH] b=17942 i=adilger i=girish update FIEMAP structures and API to match upstream --- lustre/include/lustre/ll_fiemap.h | 85 +++++++++++++++++++------------------ lustre/include/lustre/lustre_user.h | 2 +- lustre/include/obd.h | 2 +- lustre/ptlrpc/wiretest.c | 53 ++++++++++++----------- lustre/utils/wirecheck.c | 7 ++- lustre/utils/wiretest.c | 55 ++++++++++++------------ 6 files changed, 101 insertions(+), 103 deletions(-) diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h index e8620bf..8bac0f4 100644 --- a/lustre/include/lustre/ll_fiemap.h +++ b/lustre/include/lustre/ll_fiemap.h @@ -48,27 +48,27 @@ #ifndef HAVE_LINUX_FIEMAP_H struct ll_fiemap_extent { - __u64 fe_logical; /* logical offset in bytes for the start of - * the extent from the beginning of the file */ - __u64 fe_physical; /* physical offset in bytes for the start - * of the extent from the beginning of the disk */ - __u64 fe_length; /* length in bytes for the extent */ - __u32 fe_flags; /* FIEMAP_EXTENT_* flags for the extent */ - __u32 fe_device; /* device number for this extent */ + __u64 fe_logical; /* logical offset in bytes for the start of + * the extent from the beginning of the file */ + __u64 fe_physical; /* physical offset in bytes for the start + * of the extent from the beginning of the disk */ + __u64 fe_length; /* length in bytes for this extent */ + __u64 fe_reserved64[2]; + __u32 fe_flags; /* FIEMAP_EXTENT_* flags for this extent */ + __u32 fe_device; /* device number for this extent */ + __u32 fe_reserved[2]; }; struct ll_user_fiemap { - __u64 fm_start; /* logical offset (inclusive) at - * which to start mapping (in) */ - __u64 fm_length; /* logical length of mapping which - * userspace wants (in) */ - __u32 fm_flags; /* FIEMAP_FLAG_* flags for request (in/out) */ - __u32 fm_mapped_extents;/* number of extents that were mapped (out) */ - __u32 fm_extent_count; /* size of fm_extents array (in) */ - __u32 fm_reserved; - struct ll_fiemap_extent fm_extents[0]; /* array of mapped extents (out). - * Lustre uses first extent to - * send end_offset */ + __u64 fm_start; /* logical offset (inclusive) at + * which to start mapping (in) */ + __u64 fm_length; /* logical length of mapping which + * userspace wants (in) */ + __u32 fm_flags; /* FIEMAP_FLAG_* flags for request (in/out) */ + __u32 fm_mapped_extents;/* number of extents that were mapped (out) */ + __u32 fm_extent_count; /* size of fm_extents array (in) */ + __u32 fm_reserved; + struct ll_fiemap_extent fm_extents[0]; /* array of mapped extents (out) */ }; #define FIEMAP_MAX_OFFSET (~0ULL) @@ -80,30 +80,31 @@ struct ll_user_fiemap { #define FIEMAP_FLAGS_COMPAT (FIEMAP_FLAG_SYNC | FIEMAP_FLAG_XATTR | \ FIEMAP_FLAG_DEVICE_ORDER) -#define FIEMAP_EXTENT_LAST 0x00000001 /* Last extent in file. */ -#define FIEMAP_EXTENT_UNKNOWN 0x00000002 /* Data location unknown. */ -#define FIEMAP_EXTENT_DELALLOC 0x00000004 /* Location still pending. - * Sets EXTENT_UNKNOWN. */ -#define FIEMAP_EXTENT_NO_DIRECT 0x00000008 /* Data mapping undefined */ -#define FIEMAP_EXTENT_SECONDARY 0x00000010 /* Data copied offline. May - * set EXTENT_NO_DIRECT. */ -#define FIEMAP_EXTENT_NET 0x00000020 /* Data stored remotely. - * Sets EXTENT_NO_DIRECT. */ -#define FIEMAP_EXTENT_DATA_COMPRESSED 0x00000040 /* Data is compressed by fs. - * Sets EXTENT_NO_DIRECT. */ -#define FIEMAP_EXTENT_DATA_ENCRYPTED 0x00000080 /* Data is encrypted by fs. - * Sets EXTENT_NO_DIRECT. */ -#define FIEMAP_EXTENT_NOT_ALIGNED 0x00000100 /* Extent offsets may not be - * block aligned. */ -#define FIEMAP_EXTENT_DATA_INLINE 0x00000200 /* Data mixed with metadata. - * Sets EXTENT_NOT_ALIGNED.*/ -#define FIEMAP_EXTENT_DATA_TAIL 0x00000400 /* Multiple files in block. - * Sets EXTENT_NOT_ALIGNED.*/ -#define FIEMAP_EXTENT_UNWRITTEN 0x00000800 /* Space allocated, but - * no data (i.e. zero). */ -#define FIEMAP_EXTENT_MERGED 0x00001000 /* File does not natively - * support extents. Result - * merged for efficiency. */ + +#define FIEMAP_EXTENT_LAST 0x00000001 /* Last extent in file. */ +#define FIEMAP_EXTENT_UNKNOWN 0x00000002 /* Data location unknown. */ +#define FIEMAP_EXTENT_DELALLOC 0x00000004 /* Location still pending. + * Sets EXTENT_UNKNOWN. */ +#define FIEMAP_EXTENT_ENCODED 0x00000008 /* Data can not be read + * while fs is unmounted */ +#define FIEMAP_EXTENT_DATA_ENCRYPTED 0x00000080 /* Data is encrypted by fs. + * Sets EXTENT_NO_DIRECT. */ +#define FIEMAP_EXTENT_NOT_ALIGNED 0x00000100 /* Extent offsets may not be + * block aligned. */ +#define FIEMAP_EXTENT_DATA_INLINE 0x00000200 /* Data mixed with metadata. + * Sets EXTENT_NOT_ALIGNED.*/ +#define FIEMAP_EXTENT_DATA_TAIL 0x00000400 /* Multiple files in block. + * Sets EXTENT_NOT_ALIGNED.*/ +#define FIEMAP_EXTENT_UNWRITTEN 0x00000800 /* Space allocated, but + * no data (i.e. zero). */ +#define FIEMAP_EXTENT_MERGED 0x00001000 /* File does not natively + * support extents. Result + * merged for efficiency. */ + +/* Lustre specific flags - use a high bit, don't conflict with upstream flag */ +#define FIEMAP_EXTENT_NO_DIRECT 0x40000000 /* Data mapping undefined */ +#define FIEMAP_EXTENT_NET 0x80000000 /* Data stored remotely. + * Sets NO_DIRECT flag */ #else diff --git a/lustre/include/lustre/lustre_user.h b/lustre/include/lustre/lustre_user.h index 12a0f0e..d06b48d 100644 --- a/lustre/include/lustre/lustre_user.h +++ b/lustre/include/lustre/lustre_user.h @@ -62,7 +62,7 @@ #define EXT3_IOC_SETVERSION _IOW('f', 4, long) #define EXT3_IOC_GETVERSION_OLD _IOR('v', 1, long) #define EXT3_IOC_SETVERSION_OLD _IOW('v', 2, long) -#define EXT3_IOC_FIEMAP _IOWR('f', 10, struct ll_user_fiemap) +#define EXT3_IOC_FIEMAP _IOWR('f', 11, struct ll_user_fiemap) #endif /* FIEMAP flags supported by Lustre */ diff --git a/lustre/include/obd.h b/lustre/include/obd.h index efe73a2..f250c58 100644 --- a/lustre/include/obd.h +++ b/lustre/include/obd.h @@ -1111,7 +1111,7 @@ enum obd_cleanup_stage { #define KEY_CLEAR_FS "clear_fs" #define KEY_BLOCKSIZE "blocksize" #define KEY_BLOCKSIZE_BITS "blocksize_bits" -#define KEY_FIEMAP "FIEMAP" +#define KEY_FIEMAP "fiemap" #define KEY_SPTLRPC_CONF "sptlrpc_conf" #define KEY_MGSSEC "mgssec" /* XXX unused ?*/ diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c index 4e3ba2b..c93be5d 100644 --- a/lustre/ptlrpc/wiretest.c +++ b/lustre/ptlrpc/wiretest.c @@ -65,8 +65,8 @@ void lustre_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * (make -C lustre/utils newwiretest) - * running on Linux lin2 2.6.18-92.1.17-prep #3 Sun Nov 23 14:29:36 IST 2008 i686 i686 i386 G - * with gcc version 3.4.6 20060404 (Red Hat 3.4.6-10) */ + * running on Linux localhost.localdomain 2.6.18-prep #3 SMP Sun Nov 23 08:04:44 EST 2008 i68 + * with gcc version 4.1.1 20061011 (Red Hat 4.1.1-30) */ /* Constants... */ @@ -447,31 +447,31 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct obd_connect_data, padding2)); LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, " found %lld\n", (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2)); - CLASSERT(OBD_CONNECT_RDONLY == 0x00000001ULL); - CLASSERT(OBD_CONNECT_INDEX == 0x00000002ULL); - CLASSERT(OBD_CONNECT_GRANT == 0x00000008ULL); - CLASSERT(OBD_CONNECT_SRVLOCK == 0x00000010ULL); - CLASSERT(OBD_CONNECT_VERSION == 0x00000020ULL); - CLASSERT(OBD_CONNECT_REQPORTAL == 0x00000040ULL); - CLASSERT(OBD_CONNECT_ACL == 0x00000080ULL); - CLASSERT(OBD_CONNECT_XATTR == 0x00000100ULL); + CLASSERT(OBD_CONNECT_RDONLY == 0x1ULL); + CLASSERT(OBD_CONNECT_INDEX == 0x2ULL); + CLASSERT(OBD_CONNECT_GRANT == 0x8ULL); + CLASSERT(OBD_CONNECT_SRVLOCK == 0x10ULL); + CLASSERT(OBD_CONNECT_VERSION == 0x20ULL); + CLASSERT(OBD_CONNECT_REQPORTAL == 0x40ULL); + CLASSERT(OBD_CONNECT_ACL == 0x80ULL); + CLASSERT(OBD_CONNECT_XATTR == 0x100ULL); CLASSERT(OBD_CONNECT_REAL == 0x08000000ULL); CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL); - CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x00000400ULL); - CLASSERT(OBD_CONNECT_IBITS == 0x00001000ULL); - CLASSERT(OBD_CONNECT_JOIN == 0x00002000ULL); - CLASSERT(OBD_CONNECT_ATTRFID == 0x00004000ULL); - CLASSERT(OBD_CONNECT_NODEVOH == 0x00008000ULL); + CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x400ULL); + CLASSERT(OBD_CONNECT_IBITS == 0x1000ULL); + CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL); + CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL); + CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL); CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x00010000ULL); CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x00020000ULL); - CLASSERT(OBD_CONNECT_BRW_SIZE == 0x00040000ULL); - CLASSERT(OBD_CONNECT_QUOTA64 == 0x00080000ULL); - CLASSERT(OBD_CONNECT_MDS_CAPA == 0x00100000ULL); - CLASSERT(OBD_CONNECT_OSS_CAPA == 0x00200000ULL); + CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL); + CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL); + CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL); + CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL); CLASSERT(OBD_CONNECT_MDS_MDS == 0x04000000ULL); CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL); CLASSERT(OBD_CONNECT_AT == 0x01000000ULL); - CLASSERT(OBD_CONNECT_CANCELSET == 0x00400000ULL); + CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL); CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL); /* Checks for struct obdo */ @@ -2389,7 +2389,7 @@ void lustre_assert_wire_constants(void) CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000); /* Checks for struct ll_fiemap_extent */ - LASSERTF((int)sizeof(struct ll_fiemap_extent) == 32, " found %lld\n", + LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, " found %lld\n", (long long)(int)sizeof(struct ll_fiemap_extent)); LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, " found %lld\n", (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical)); @@ -2403,27 +2403,26 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct ll_fiemap_extent, fe_length)); LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, " found %lld\n", (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length)); - LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 24, " found %lld\n", + LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, " found %lld\n", (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags)); LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, " found %lld\n", (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags)); - LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 28, " found %lld\n", + LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, " found %lld\n", (long long)(int)offsetof(struct ll_fiemap_extent, fe_device)); LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, " found %lld\n", (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device)); CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001); CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002); CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004); - CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x00000008); - CLASSERT(FIEMAP_EXTENT_SECONDARY == 0x00000010); - CLASSERT(FIEMAP_EXTENT_NET == 0x00000020); - CLASSERT(FIEMAP_EXTENT_DATA_COMPRESSED == 0x00000040); + CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008); CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080); CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100); CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200); CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400); CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800); CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000); + CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000); + CLASSERT(FIEMAP_EXTENT_NET == 0x80000000); #ifdef LIBLUSTRE_POSIX_ACL /* Checks for type posix_acl_xattr_entry */ diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c index b8e5d064..956af80 100644 --- a/lustre/utils/wirecheck.c +++ b/lustre/utils/wirecheck.c @@ -1182,16 +1182,15 @@ check_ll_fiemap_extent(void) CHECK_CDEFINE(FIEMAP_EXTENT_LAST); CHECK_CDEFINE(FIEMAP_EXTENT_UNKNOWN); CHECK_CDEFINE(FIEMAP_EXTENT_DELALLOC); - CHECK_CDEFINE(FIEMAP_EXTENT_NO_DIRECT); - CHECK_CDEFINE(FIEMAP_EXTENT_SECONDARY); - CHECK_CDEFINE(FIEMAP_EXTENT_NET); - CHECK_CDEFINE(FIEMAP_EXTENT_DATA_COMPRESSED); + CHECK_CDEFINE(FIEMAP_EXTENT_ENCODED); CHECK_CDEFINE(FIEMAP_EXTENT_DATA_ENCRYPTED); CHECK_CDEFINE(FIEMAP_EXTENT_NOT_ALIGNED); CHECK_CDEFINE(FIEMAP_EXTENT_DATA_INLINE); CHECK_CDEFINE(FIEMAP_EXTENT_DATA_TAIL); CHECK_CDEFINE(FIEMAP_EXTENT_UNWRITTEN); CHECK_CDEFINE(FIEMAP_EXTENT_MERGED); + CHECK_CDEFINE(FIEMAP_EXTENT_NO_DIRECT); + CHECK_CDEFINE(FIEMAP_EXTENT_NET); } static void diff --git a/lustre/utils/wiretest.c b/lustre/utils/wiretest.c index f3609a9..1a1fa03 100644 --- a/lustre/utils/wiretest.c +++ b/lustre/utils/wiretest.c @@ -62,8 +62,8 @@ void lustre_assert_wire_constants(void) { /* Wire protocol assertions generated by 'wirecheck' * (make -C lustre/utils newwiretest) - * running on Linux lin2 2.6.18-92.1.17-prep #3 Sun Nov 23 14:29:36 IST 2008 i686 i686 i386 G - * with gcc version 3.4.6 20060404 (Red Hat 3.4.6-10) */ + * running on Linux localhost.localdomain 2.6.18-prep #3 SMP Sun Nov 23 08:04:44 EST 2008 i68 + * with gcc version 4.1.1 20061011 (Red Hat 4.1.1-30) */ /* Constants... */ @@ -444,31 +444,31 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct obd_connect_data, padding2)); LASSERTF((int)sizeof(((struct obd_connect_data *)0)->padding2) == 8, " found %lld\n", (long long)(int)sizeof(((struct obd_connect_data *)0)->padding2)); - CLASSERT(OBD_CONNECT_RDONLY == 0x00000001ULL); - CLASSERT(OBD_CONNECT_INDEX == 0x00000002ULL); - CLASSERT(OBD_CONNECT_GRANT == 0x00000008ULL); - CLASSERT(OBD_CONNECT_SRVLOCK == 0x00000010ULL); - CLASSERT(OBD_CONNECT_VERSION == 0x00000020ULL); - CLASSERT(OBD_CONNECT_REQPORTAL == 0x00000040ULL); - CLASSERT(OBD_CONNECT_ACL == 0x00000080ULL); - CLASSERT(OBD_CONNECT_XATTR == 0x00000100ULL); + CLASSERT(OBD_CONNECT_RDONLY == 0x1ULL); + CLASSERT(OBD_CONNECT_INDEX == 0x2ULL); + CLASSERT(OBD_CONNECT_GRANT == 0x8ULL); + CLASSERT(OBD_CONNECT_SRVLOCK == 0x10ULL); + CLASSERT(OBD_CONNECT_VERSION == 0x20ULL); + CLASSERT(OBD_CONNECT_REQPORTAL == 0x40ULL); + CLASSERT(OBD_CONNECT_ACL == 0x80ULL); + CLASSERT(OBD_CONNECT_XATTR == 0x100ULL); CLASSERT(OBD_CONNECT_REAL == 0x08000000ULL); CLASSERT(OBD_CONNECT_CKSUM == 0x20000000ULL); - CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x00000400ULL); - CLASSERT(OBD_CONNECT_IBITS == 0x00001000ULL); - CLASSERT(OBD_CONNECT_JOIN == 0x00002000ULL); - CLASSERT(OBD_CONNECT_ATTRFID == 0x00004000ULL); - CLASSERT(OBD_CONNECT_NODEVOH == 0x00008000ULL); + CLASSERT(OBD_CONNECT_TRUNCLOCK == 0x400ULL); + CLASSERT(OBD_CONNECT_IBITS == 0x1000ULL); + CLASSERT(OBD_CONNECT_JOIN == 0x2000ULL); + CLASSERT(OBD_CONNECT_ATTRFID == 0x4000ULL); + CLASSERT(OBD_CONNECT_NODEVOH == 0x8000ULL); CLASSERT(OBD_CONNECT_RMT_CLIENT == 0x00010000ULL); CLASSERT(OBD_CONNECT_RMT_CLIENT_FORCE == 0x00020000ULL); - CLASSERT(OBD_CONNECT_BRW_SIZE == 0x00040000ULL); - CLASSERT(OBD_CONNECT_QUOTA64 == 0x00080000ULL); - CLASSERT(OBD_CONNECT_MDS_CAPA == 0x00100000ULL); - CLASSERT(OBD_CONNECT_OSS_CAPA == 0x00200000ULL); + CLASSERT(OBD_CONNECT_BRW_SIZE == 0x40000ULL); + CLASSERT(OBD_CONNECT_QUOTA64 == 0x80000ULL); + CLASSERT(OBD_CONNECT_MDS_CAPA == 0x100000ULL); + CLASSERT(OBD_CONNECT_OSS_CAPA == 0x200000ULL); CLASSERT(OBD_CONNECT_MDS_MDS == 0x04000000ULL); CLASSERT(OBD_CONNECT_SOM == 0x00800000ULL); CLASSERT(OBD_CONNECT_AT == 0x01000000ULL); - CLASSERT(OBD_CONNECT_CANCELSET == 0x00400000ULL); + CLASSERT(OBD_CONNECT_CANCELSET == 0x400000ULL); CLASSERT(OBD_CONNECT_LRU_RESIZE == 0x02000000ULL); /* Checks for struct obdo */ @@ -2386,7 +2386,7 @@ void lustre_assert_wire_constants(void) CLASSERT(FIEMAP_FLAG_DEVICE_ORDER == 0x40000000); /* Checks for struct ll_fiemap_extent */ - LASSERTF((int)sizeof(struct ll_fiemap_extent) == 32, " found %lld\n", + LASSERTF((int)sizeof(struct ll_fiemap_extent) == 56, " found %lld\n", (long long)(int)sizeof(struct ll_fiemap_extent)); LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_logical) == 0, " found %lld\n", (long long)(int)offsetof(struct ll_fiemap_extent, fe_logical)); @@ -2400,28 +2400,27 @@ void lustre_assert_wire_constants(void) (long long)(int)offsetof(struct ll_fiemap_extent, fe_length)); LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_length) == 8, " found %lld\n", (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_length)); - LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 24, " found %lld\n", + LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_flags) == 40, " found %lld\n", (long long)(int)offsetof(struct ll_fiemap_extent, fe_flags)); LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags) == 4, " found %lld\n", (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_flags)); - LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 28, " found %lld\n", + LASSERTF((int)offsetof(struct ll_fiemap_extent, fe_device) == 44, " found %lld\n", (long long)(int)offsetof(struct ll_fiemap_extent, fe_device)); LASSERTF((int)sizeof(((struct ll_fiemap_extent *)0)->fe_device) == 4, " found %lld\n", (long long)(int)sizeof(((struct ll_fiemap_extent *)0)->fe_device)); CLASSERT(FIEMAP_EXTENT_LAST == 0x00000001); CLASSERT(FIEMAP_EXTENT_UNKNOWN == 0x00000002); CLASSERT(FIEMAP_EXTENT_DELALLOC == 0x00000004); - CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x00000008); - CLASSERT(FIEMAP_EXTENT_SECONDARY == 0x00000010); - CLASSERT(FIEMAP_EXTENT_NET == 0x00000020); - CLASSERT(FIEMAP_EXTENT_DATA_COMPRESSED == 0x00000040); + CLASSERT(FIEMAP_EXTENT_ENCODED == 0x00000008); CLASSERT(FIEMAP_EXTENT_DATA_ENCRYPTED == 0x00000080); CLASSERT(FIEMAP_EXTENT_NOT_ALIGNED == 0x00000100); CLASSERT(FIEMAP_EXTENT_DATA_INLINE == 0x00000200); CLASSERT(FIEMAP_EXTENT_DATA_TAIL == 0x00000400); CLASSERT(FIEMAP_EXTENT_UNWRITTEN == 0x00000800); CLASSERT(FIEMAP_EXTENT_MERGED == 0x00001000); -#if defined(LIBLUSTRE_POSIX_ACL) && defined(CONFIG_FS_POSIX_ACL) + CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000); + CLASSERT(FIEMAP_EXTENT_NET == 0x80000000); +#ifdef LIBLUSTRE_POSIX_ACL /* Checks for type posix_acl_xattr_entry */ LASSERTF((int)sizeof(xattr_acl_entry) == 8, " found %lld\n", -- 1.8.3.1