Updated for build 42.

[fs/lustre-release.git] / lustre / cmm / cmm_internal.h

diff --git a/lustre/cmm/cmm_internal.h b/lustre/cmm/cmm_internal.h
index 4dc359f..00bfcce 100644 (file)
--- a/lustre/cmm/cmm_internal.h
+++ b/lustre/cmm/cmm_internal.h
@@ -62,8 +62,8 @@ struct cmm_device {
         /* other MD servers in cluster */
         mdsno_t                 cmm_local_num;
         __u32                   cmm_tgt_count;
-        struct list_head        cmm_targets;
-        spinlock_t              cmm_tgt_guard;
+        cfs_list_t              cmm_targets;
+        cfs_spinlock_t          cmm_tgt_guard;
         cfs_proc_dir_entry_t   *cmm_proc_entry;
         struct lprocfs_stats   *cmm_stats;
 };
@@ -196,7 +196,7 @@ static inline struct cml_object *cmm2cml_obj(struct cmm_object *co)
 }
 
 int cmm_upcall(const struct lu_env *env, struct md_device *md,
-               enum md_upcall_event ev);
+               enum md_upcall_event ev, void *data);
 
 #ifdef HAVE_SPLIT_SUPPORT