b=21452 kABI tracking

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

diff --git a/lustre/cmm/cmm_internal.h b/lustre/cmm/cmm_internal.h
index e3b1da2..ae27ff2 100644 (file)
--- a/lustre/cmm/cmm_internal.h
+++ b/lustre/cmm/cmm_internal.h
@@ -26,7 +26,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -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;
 };
@@ -75,9 +75,10 @@ enum cmm_flags {
         CMM_INITIALIZED = 1 << 0
 };
 
-static inline struct md_device_operations *cmm_child_ops(struct cmm_device *d)
+static inline const struct md_device_operations *
+cmm_child_ops(struct cmm_device *d)
 {
-        return (d->cmm_child->md_ops);
+        return d->cmm_child->md_ops;
 }
 
 static inline struct cmm_device *md2cmm_dev(struct md_device *m)
@@ -195,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