staging/lustre/llapi: add user space method for lov_user_md
authorjcl <jacques-charles.lafoucriere@cea.fr>
Mon, 22 Jul 2013 16:06:41 +0000 (00:06 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 23 Jul 2013 19:48:25 +0000 (12:48 -0700)
move lov_mds_md_size from obd_lov.h to lustre_idl.h
to have it close to lov_mds_md definition.

add lov_user_md_size() to compute lum size so
llapi and user space utils do not use kernel internal
definitions/methods

Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-3345
Lustre-change: http://review.whamcloud.com/6345
Signed-off-by: JC Lafoucriere <jacques-charles.lafoucriere@cea.fr>
Reviewed-by: Jinshan Xiong <jinshan.xiong@intel.com>
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Peng Tao <tao.peng@emc.com>
Signed-off-by: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/include/lustre/lustre_idl.h
drivers/staging/lustre/lustre/include/lustre/lustre_user.h
drivers/staging/lustre/lustre/include/obd_lov.h

index 30c03317fb6f93d4debef51df1c773017d976a4f..ace4e18dfae8ec2d2c709c061f3f33fdbdecaeae 100644 (file)
@@ -1670,6 +1670,17 @@ struct lov_mds_md_v3 {       /* LOV EA mds/wire data (little-endian) */
        struct lov_ost_data_v1 lmm_objects[0]; /* per-stripe data */
 };
 
+static inline __u32 lov_mds_md_size(__u16 stripes, __u32 lmm_magic)
+{
+       if (lmm_magic == LOV_MAGIC_V3)
+               return sizeof(struct lov_mds_md_v3) +
+                               stripes * sizeof(struct lov_ost_data_v1);
+       else
+               return sizeof(struct lov_mds_md_v1) +
+                               stripes * sizeof(struct lov_ost_data_v1);
+}
+
+
 #define OBD_MD_FLID    (0x00000001ULL) /* object ID */
 #define OBD_MD_FLATIME     (0x00000002ULL) /* access time */
 #define OBD_MD_FLMTIME     (0x00000004ULL) /* data modification time */
index f72b2e4cbca1e93e8e8cc91361c96eaa3219c0d7..c7bd4473a1d0fab2e38591d814cbb6e34dfaa6fe 100644 (file)
@@ -347,6 +347,16 @@ struct lov_user_md_v3 {       /* LOV EA user data (host-endian) */
        struct lov_user_ost_data_v1 lmm_objects[0]; /* per-stripe data */
 } __attribute__((packed));
 
+static inline __u32 lov_user_md_size(__u16 stripes, __u32 lmm_magic)
+{
+       if (lmm_magic == LOV_USER_MAGIC_V3)
+               return sizeof(struct lov_user_md_v3) +
+                               stripes * sizeof(struct lov_user_ost_data_v1);
+       else
+               return sizeof(struct lov_user_md_v1) +
+                               stripes * sizeof(struct lov_user_ost_data_v1);
+}
+
 /* Compile with -D_LARGEFILE64_SOURCE or -D_GNU_SOURCE (or #define) to
  * use this.  It is unsafe to #define those values in this header as it
  * is possible the application has already #included <sys/stat.h>. */
index d82f3341d0a8822894537dee5764bcbfd78a3912..235718b366dc2951ea3310742b7ac6828dd8d0e3 100644 (file)
@@ -44,16 +44,6 @@ static inline int lov_stripe_md_size(__u16 stripes)
        return sizeof(struct lov_stripe_md) + stripes*sizeof(struct lov_oinfo*);
 }
 
-static inline __u32 lov_mds_md_size(__u16 stripes, __u32 lmm_magic)
-{
-       if (lmm_magic == LOV_MAGIC_V3)
-               return sizeof(struct lov_mds_md_v3) +
-                       stripes * sizeof(struct lov_ost_data_v1);
-       else
-               return sizeof(struct lov_mds_md_v1) +
-                       stripes * sizeof(struct lov_ost_data_v1);
-}
-
 struct lov_version_size {
        __u32   lvs_magic;
        size_t  lvs_lmm_size;