LU-931 mdd: store lu_fid instead of pointer in md_capainfo

[fs/lustre-release.git] / lustre / include / md_object.h

diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h
index 9a7e3ee..cd52a7d 100644 (file)
--- a/lustre/include/md_object.h
+++ b/lustre/include/md_object.h
@@ -30,6 +30,9 @@
  * Use is subject to license terms.
  */
 /*
+ * Copyright (c) 2011 Whamcloud, Inc.
+ */
+/*
  * This file is part of Lustre, http://www.lustre.org/
  * Lustre is a trademark of Sun Microsystems, Inc.
  *
@@ -97,7 +100,7 @@ enum {
 struct md_capainfo {
         __u32                   mc_auth;
         __u32                   mc_padding;
-        const struct lu_fid    *mc_fid[MD_CAPAINFO_MAX];
+        struct lu_fid           mc_fid[MD_CAPAINFO_MAX];
         struct lustre_capa     *mc_capa[MD_CAPAINFO_MAX];
 };
 
@@ -124,9 +127,10 @@ enum ma_valid {
         MA_LMV       = (1 << 4),
         MA_ACL_DEF   = (1 << 5),
         MA_LOV_DEF   = (1 << 6),
-/* (Layout lock will used #7 here) */
+        MA_LAY_GEN   = (1 << 7),
         MA_HSM       = (1 << 8),
-        MA_SOM       = (1 << 9)
+        MA_SOM       = (1 << 9),
+        MA_PFID      = (1 << 10)
 };
 
 typedef enum {
@@ -166,17 +170,19 @@ struct md_attr {
         __u64                   ma_need;
         __u64                   ma_attr_flags;
         struct lu_attr          ma_attr;
+        struct lu_fid           ma_pfid;
+        struct md_hsm           ma_hsm;
         struct lov_mds_md      *ma_lmm;
-        int                     ma_lmm_size;
         struct lmv_stripe_md   *ma_lmv;
-        int                     ma_lmv_size;
         void                   *ma_acl;
-        int                     ma_acl_size;
         struct llog_cookie     *ma_cookie;
-        int                     ma_cookie_size;
         struct lustre_capa     *ma_capa;
-        struct md_hsm           ma_hsm;
         struct md_som_data     *ma_som;
+        int                     ma_lmm_size;
+        int                     ma_lmv_size;
+        int                     ma_acl_size;
+        int                     ma_cookie_size;
+        __u16                   ma_layout_gen;
 };
 
 /** Additional parameters for create */
@@ -240,6 +246,7 @@ struct md_object_operations {
         int (*moo_xattr_del)(const struct lu_env *env, struct md_object *obj,
                              const char *name);
 
+        /** \retval number of bytes actually read upon success */
         int (*moo_readpage)(const struct lu_env *env, struct md_object *obj,
                             const struct lu_rdpg *rdpg);
 
@@ -266,16 +273,12 @@ struct md_object_operations {
                         struct md_object *obj, int flag);
 
         int (*moo_close)(const struct lu_env *env, struct md_object *obj,
-                         struct md_attr *ma);
+                         struct md_attr *ma, int mode);
 
         int (*moo_capa_get)(const struct lu_env *, struct md_object *,
                             struct lustre_capa *, int renewal);
 
         int (*moo_object_sync)(const struct lu_env *, struct md_object *);
-        dt_obj_version_t (*moo_version_get)(const struct lu_env *,
-                                            struct md_object *);
-        void (*moo_version_set)(const struct lu_env *, struct md_object *,
-                                dt_obj_version_t);
         int (*moo_path)(const struct lu_env *env, struct md_object *obj,
                         char *path, int pathlen, __u64 *recno, int *linkno);
         int (*moo_file_lock)(const struct lu_env *env, struct md_object *obj,
@@ -325,6 +328,13 @@ struct md_dir_operations {
                           struct md_object *cobj, const struct lu_name *lname,
                           struct md_attr *ma);
 
+        /** This method is used to compare a requested layout to an existing
+         * layout (struct lov_mds_md_v1/3 vs struct lov_mds_md_v1/3) */
+        int (*mdo_lum_lmm_cmp)(const struct lu_env *env,
+                               struct md_object *cobj,
+                               const struct md_op_spec *spec,
+                               struct md_attr *ma);
+
         /** partial ops for cross-ref case */
         int (*mdo_name_insert)(const struct lu_env *env,
                                struct md_object *obj,
@@ -687,10 +697,11 @@ static inline int mo_open(const struct lu_env *env,
 
 static inline int mo_close(const struct lu_env *env,
                            struct md_object *m,
-                           struct md_attr *ma)
+                           struct md_attr *ma,
+                           int mode)
 {
         LASSERT(m->mo_ops->moo_close);
-        return m->mo_ops->moo_close(env, m, ma);
+        return m->mo_ops->moo_close(env, m, ma, mode);
 }
 
 static inline int mo_readpage(const struct lu_env *env,
@@ -749,20 +760,6 @@ static inline int mo_object_sync(const struct lu_env *env, struct md_object *m)
         return m->mo_ops->moo_object_sync(env, m);
 }
 
-static inline dt_obj_version_t mo_version_get(const struct lu_env *env,
-                                              struct md_object *m)
-{
-        LASSERT(m->mo_ops->moo_version_get);
-        return m->mo_ops->moo_version_get(env, m);
-}
-
-static inline void mo_version_set(const struct lu_env *env,
-                                  struct md_object *m, dt_obj_version_t ver)
-{
-        LASSERT(m->mo_ops->moo_version_set);
-        return m->mo_ops->moo_version_set(env, m, ver);
-}
-
 static inline int mo_file_lock(const struct lu_env *env, struct md_object *m,
                                struct lov_mds_md *lmm,
                                struct ldlm_extent *extent,
@@ -863,6 +860,15 @@ static inline int mdo_unlink(const struct lu_env *env,
         return c->mo_dir_ops->mdo_unlink(env, p, c, lname, ma);
 }
 
+static inline int mdo_lum_lmm_cmp(const struct lu_env *env,
+                                  struct md_object *c,
+                                  const struct md_op_spec *spec,
+                                  struct md_attr *ma)
+{
+        LASSERT(c->mo_dir_ops->mdo_lum_lmm_cmp);
+        return c->mo_dir_ops->mdo_lum_lmm_cmp(env, c, spec, ma);
+}
+
 static inline int mdo_name_insert(const struct lu_env *env,
                                   struct md_object *p,
                                   const struct lu_name *lname,