b=21115

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

diff --git a/lustre/cmm/cmm_internal.h b/lustre/cmm/cmm_internal.h
index b390937..36e9b16 100644 (file)
--- a/lustre/cmm/cmm_internal.h
+++ b/lustre/cmm/cmm_internal.h
@@ -16,8 +16,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -48,7 +48,7 @@
 #include <obd.h>
 #include <lustre_fld.h>
 #include <md_object.h>
-#include <linux/lustre_acl.h>
+#include <lustre_acl.h>
 
 
 struct cmm_device {
@@ -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