b=17942

i=adilger
i=girish

update fiemap structures and API to match upstream

diff --git a/lustre/include/lustre/ll_fiemap.h b/lustre/include/lustre/ll_fiemap.h
index 92f71a9..271ca5b 100644 (file)
--- a/lustre/include/lustre/ll_fiemap.h
+++ b/lustre/include/lustre/ll_fiemap.h
@@ -50,27 +50,27 @@
 #include <linux/lustre_types.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)
@@ -82,30 +82,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 8061f04..4de22db 100644 (file)
--- 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 4646826..736f19b 100644 (file)
--- a/lustre/include/obd.h
+++ b/lustre/include/obd.h
@@ -950,7 +950,7 @@ enum obd_cleanup_stage {
 #define KEY_BLOCKSIZE           "blocksize"
 #define KEY_BLOCKSIZE_BITS      "blocksize_bits"
 #define KEY_MAX_EASIZE          "max_ea_size"
-#define KEY_FIEMAP              "FIEMAP"
+#define KEY_FIEMAP              "fiemap"
 /* XXX unused */
 #define KEY_ASYNC               "async"
 

diff --git a/lustre/ptlrpc/wiretest.c b/lustre/ptlrpc/wiretest.c
index 7e2b085..34906e4 100644 (file)
--- a/lustre/ptlrpc/wiretest.c
+++ b/lustre/ptlrpc/wiretest.c
@@ -61,13 +61,12 @@
 #include <obd_class.h>
 #include <lustre_net.h>
 #include <lustre_disk.h>
-
 void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux xlab.hostel 2.6.23.12-52.fc7 #1 SMP Tue Dec 18 21:18:02 EST 2007 i686 i68
-         * with gcc version 3.4.6 20060404 (Red Hat 3.4.6-7) */
+         * running on Linux localhost.localdomain 2.6.22.14 #1 SMP Fri Jan 2 17:31:54 IST 2009 i686 i
+         * with gcc version 4.1.1 20061011 (Red Hat 4.1.1-30) */
 
 
         /* Constants... */
@@ -1647,6 +1646,38 @@ void lustre_assert_wire_constants(void)
         LASSERTF((int)sizeof(((struct ost_lvb *)0)->lvb_blocks) == 8, " found %lld\n",
                  (long long)(int)sizeof(((struct ost_lvb *)0)->lvb_blocks));
 
+        /* Checks for struct cfg_marker */
+        LASSERTF((int)sizeof(struct cfg_marker) == 160, " found %lld\n",
+                 (long long)(int)sizeof(struct cfg_marker));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_step) == 0, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_step));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_step) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_step));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_flags) == 4, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_flags));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_flags) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_flags));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_vers) == 8, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_vers));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_vers) == 4, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_vers));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_createtime) == 16, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_createtime));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_createtime) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_createtime));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_canceltime) == 24, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_canceltime));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_canceltime) == 8, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_canceltime));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_tgtname) == 32, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_tgtname));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_tgtname) == 64, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_tgtname));
+        LASSERTF((int)offsetof(struct cfg_marker, cm_comment) == 96, " found %lld\n",
+                 (long long)(int)offsetof(struct cfg_marker, cm_comment));
+        LASSERTF((int)sizeof(((struct cfg_marker *)0)->cm_comment) == 64, " found %lld\n",
+                 (long long)(int)sizeof(((struct cfg_marker *)0)->cm_comment));
+
         /* Checks for struct llog_logid */
         LASSERTF((int)sizeof(struct llog_logid) == 20, " found %lld\n",
                  (long long)(int)sizeof(struct llog_logid));
@@ -2294,7 +2325,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));
@@ -2308,28 +2339,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);
-#ifdef LIBLUSTRE_POSIX_ACL
+        CLASSERT(FIEMAP_EXTENT_NO_DIRECT == 0x40000000);
+        CLASSERT(FIEMAP_EXTENT_NET == 0x80000000);
+#if defined(LIBLUSTRE_POSIX_ACL) && defined(CONFIG_FS_POSIX_ACL)
 
         /* Checks for type posix_acl_xattr_entry */
         LASSERTF((int)sizeof(xattr_acl_entry) == 8, " found %lld\n",

diff --git a/lustre/utils/wirecheck.c b/lustre/utils/wirecheck.c
index 1e50887..4d3a8a2 100644 (file)
--- a/lustre/utils/wirecheck.c
+++ b/lustre/utils/wirecheck.c
@@ -1155,16 +1155,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 d0812a3..e241376 100644 (file)
--- a/lustre/utils/wiretest.c
+++ b/lustre/utils/wiretest.c
@@ -59,13 +59,12 @@ int main()
 
         return ret;
 }
-
 void lustre_assert_wire_constants(void)
 {
         /* Wire protocol assertions generated by 'wirecheck'
          * (make -C lustre/utils newwiretest)
-         * running on Linux xlab.hostel 2.6.23.12-52.fc7 #1 SMP Tue Dec 18 21:18:02 EST 2007 i686 i68
-         * with gcc version 3.4.6 20060404 (Red Hat 3.4.6-7) */
+         * running on Linux localhost.localdomain 2.6.22.14 #1 SMP Fri Jan 2 17:31:54 IST 2009 i686 i
+         * with gcc version 4.1.1 20061011 (Red Hat 4.1.1-30) */
 
 
         /* Constants... */
@@ -2324,7 +2323,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));
@@ -2338,27 +2337,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);
 #if defined(LIBLUSTRE_POSIX_ACL) && defined(CONFIG_FS_POSIX_ACL)
 
         /* Checks for type posix_acl_xattr_entry */