LU-404 bind umount /sbin/mount.lustre only if necessary

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

diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h
index afe8d35..fbdd34f 100644 (file)
--- a/lustre/include/md_object.h
+++ b/lustre/include/md_object.h
@@ -126,7 +126,8 @@ enum ma_valid {
         MA_LOV_DEF   = (1 << 6),
 /* (Layout lock will used #7 here) */
         MA_HSM       = (1 << 8),
-        MA_SOM       = (1 << 9)
+        MA_SOM       = (1 << 9),
+        MA_PFID      = (1 << 10)
 };
 
 typedef enum {
@@ -149,9 +150,8 @@ typedef enum {
 
 struct md_hsm {
         __u32  mh_flags;
+        __u32  mh_archive_number;
 };
-#define ma_hsm_flags ma_hsm.mh_flags
-#define HSM_FLAGS_MASK 0
 
 #define IOEPOCH_INVAL 0
 
@@ -178,6 +178,7 @@ struct md_attr {
         struct lustre_capa     *ma_capa;
         struct md_hsm           ma_hsm;
         struct md_som_data     *ma_som;
+        struct lu_fid           ma_pfid;
 };
 
 /** Additional parameters for create */
@@ -199,7 +200,7 @@ struct md_op_spec {
         int no_create;
 
         /** Create flag from client: such as MDS_OPEN_CREAT, and others. */
-        __u32      sp_cr_flags;
+        __u64      sp_cr_flags;
 
         /** Should mdd do lookup sanity check or not. */
         int        sp_cr_lookup;
@@ -246,7 +247,9 @@ struct md_object_operations {
 
         int (*moo_readlink)(const struct lu_env *env, struct md_object *obj,
                             struct lu_buf *buf);
-
+        int (*moo_changelog)(const struct lu_env *env,
+                             enum changelog_rec_type type, int flags,
+                             struct md_object *obj);
         /** part of cross-ref operation */
         int (*moo_object_create)(const struct lu_env *env,
                                  struct md_object *obj,
@@ -277,6 +280,12 @@ struct md_object_operations {
                                 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,
+                             struct lov_mds_md *lmm, struct ldlm_extent *extent,
+                             struct lustre_handle *lockh);
+        int (*moo_file_unlock)(const struct lu_env *env, struct md_object *obj,
+                               struct lov_mds_md *lmm,
+                               struct lustre_handle *lockh);
 };
 
 /**
@@ -619,6 +628,14 @@ static inline int mo_readlink(const struct lu_env *env,
         return m->mo_ops->moo_readlink(env, m, buf);
 }
 
+static inline int mo_changelog(const struct lu_env *env,
+                               enum changelog_rec_type type,
+                               int flags, struct md_object *m)
+{
+        LASSERT(m->mo_ops->moo_changelog);
+        return m->mo_ops->moo_changelog(env, type, flags, m);
+}
+
 static inline int mo_attr_set(const struct lu_env *env,
                               struct md_object *m,
                               const struct md_attr *at)
@@ -748,6 +765,23 @@ static inline void mo_version_set(const struct lu_env *env,
         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,
+                               struct lustre_handle *lockh)
+{
+        LASSERT(m->mo_ops->moo_file_lock);
+        return m->mo_ops->moo_file_lock(env, m, lmm, extent, lockh);
+}
+
+static inline int mo_file_unlock(const struct lu_env *env, struct md_object *m,
+                                 struct lov_mds_md *lmm,
+                                 struct lustre_handle *lockh)
+{
+        LASSERT(m->mo_ops->moo_file_unlock);
+        return m->mo_ops->moo_file_unlock(env, m, lmm, lockh);
+}
+
 static inline int mdo_lookup(const struct lu_env *env,
                              struct md_object *p,
                              const struct lu_name *lname,