X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Fmd_object.h;h=df6d505d55e3f3e397afd3598138de04c7fb2e37;hb=7d2a94e40959a63d97ca4adc9a5d7a33511faa55;hp=bfa7de43f9d3782817d7b51c60ab9710aba0be1a;hpb=9587ede5df1cd99c74dd732b84d885106af57ca0;p=fs%2Flustre-release.git

diff --git a/lustre/include/md_object.h b/lustre/include/md_object.h
index bfa7de4..df6d505 100644
--- a/lustre/include/md_object.h
+++ b/lustre/include/md_object.h
@@ -84,7 +84,7 @@ struct md_ucred {
         __u32               mu_suppgids[2];
         cfs_cap_t           mu_cap;
         __u32               mu_umask;
-        struct group_info  *mu_ginfo;
+        cfs_group_info_t   *mu_ginfo;
         struct md_identity *mu_identity;
 };
 
@@ -123,7 +123,10 @@ enum ma_valid {
         MA_FLAGS     = (1 << 3),
         MA_LMV       = (1 << 4),
         MA_ACL_DEF   = (1 << 5),
-        MA_LOV_DEF   = (1 << 6)
+        MA_LOV_DEF   = (1 << 6),
+/* (Layout lock will used #7 here) */
+        MA_HSM       = (1 << 8),
+        MA_SOM       = (1 << 9)
 };
 
 typedef enum {
@@ -144,6 +147,21 @@ typedef enum {
         MDT_PDO_LOCK = (1 << 1)
 } mdl_type_t;
 
+struct md_hsm {
+        __u32  mh_flags;
+};
+#define ma_hsm_flags ma_hsm.mh_flags
+#define HSM_FLAGS_MASK 0
+
+#define IOEPOCH_INVAL 0
+
+struct md_som_data {
+        __u64 msd_ioepoch;
+        __u64 msd_size;
+        __u64 msd_blocks;
+        __u64 msd_mountid;
+};
+
 struct md_attr {
         __u64                   ma_valid;
         __u64                   ma_need;
@@ -158,6 +176,8 @@ struct md_attr {
         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;
 };
 
 /** Additional parameters for create */
@@ -324,7 +344,7 @@ struct md_device_operations {
                                int *md_size, int *cookie_size);
 
         int (*mdo_statfs)(const struct lu_env *env, struct md_device *m,
-                          struct kstatfs *sfs);
+                          cfs_kstatfs_t *sfs);
 
         int (*mdo_init_capa_ctxt)(const struct lu_env *env, struct md_device *m,
                                   int mode, unsigned long timeout, __u32 alg,
@@ -427,7 +447,7 @@ enum md_upcall_event {
 struct md_upcall {
         /** this lock protects upcall using against its removal
          * read lock is for usage the upcall, write - for init/fini */
-        struct rw_semaphore     mu_upcall_sem;
+        cfs_rw_semaphore_t      mu_upcall_sem;
         /** device to call, upper layer normally */
         struct md_device       *mu_upcall_dev;
         /** upcall function */
@@ -443,38 +463,38 @@ struct md_device {
 
 static inline void md_upcall_init(struct md_device *m, void *upcl)
 {
-        init_rwsem(&m->md_upcall.mu_upcall_sem);
+        cfs_init_rwsem(&m->md_upcall.mu_upcall_sem);
         m->md_upcall.mu_upcall_dev = NULL;
         m->md_upcall.mu_upcall = upcl;
 }
 
 static inline void md_upcall_dev_set(struct md_device *m, struct md_device *up)
 {
-        down_write(&m->md_upcall.mu_upcall_sem);
+        cfs_down_write(&m->md_upcall.mu_upcall_sem);
         m->md_upcall.mu_upcall_dev = up;
-        up_write(&m->md_upcall.mu_upcall_sem);
+        cfs_up_write(&m->md_upcall.mu_upcall_sem);
 }
 
 static inline void md_upcall_fini(struct md_device *m)
 {
-        down_write(&m->md_upcall.mu_upcall_sem);
+        cfs_down_write(&m->md_upcall.mu_upcall_sem);
         m->md_upcall.mu_upcall_dev = NULL;
         m->md_upcall.mu_upcall = NULL;
-        up_write(&m->md_upcall.mu_upcall_sem);
+        cfs_up_write(&m->md_upcall.mu_upcall_sem);
 }
 
 static inline int md_do_upcall(const struct lu_env *env, struct md_device *m,
                                enum md_upcall_event ev, void *data)
 {
         int rc = 0;
-        down_read(&m->md_upcall.mu_upcall_sem);
+        cfs_down_read(&m->md_upcall.mu_upcall_sem);
         if (m->md_upcall.mu_upcall_dev != NULL &&
             m->md_upcall.mu_upcall_dev->md_upcall.mu_upcall != NULL) {
                 rc = m->md_upcall.mu_upcall_dev->md_upcall.mu_upcall(env,
                                               m->md_upcall.mu_upcall_dev,
                                               ev, data);
         }
-        up_read(&m->md_upcall.mu_upcall_sem);
+        cfs_up_read(&m->md_upcall.mu_upcall_sem);
         return rc;
 }
 
@@ -856,8 +876,8 @@ struct lu_local_obj_desc {
         const char                      *llod_name;
         __u32                            llod_oid;
         int                              llod_is_index;
-        const struct dt_index_features * llod_feat;
-        struct list_head                 llod_linkage;
+        const struct dt_index_features  *llod_feat;
+        cfs_list_t                       llod_linkage;
 };
 
 struct md_object *llo_store_resolve(const struct lu_env *env,