b=21500 2.6.31-fc12 patchless client support

[fs/lustre-release.git] / lustre / cmm / mdc_device.c

diff --git a/lustre/cmm/mdc_device.c b/lustre/cmm/mdc_device.c
index d3a7c3b..fc77a67 100644 (file)
--- a/lustre/cmm/mdc_device.c
+++ b/lustre/cmm/mdc_device.c
@@ -64,7 +64,7 @@ static const struct md_device_operations mdc_md_ops = { 0 };
 
 static int mdc_obd_update(struct obd_device *host,
                           struct obd_device *watched,
-                          enum obd_notify_event ev, void *owner)
+                          enum obd_notify_event ev, void *owner, void *data)
 {
         struct mdc_device *mc = owner;
         int rc = 0;
@@ -286,7 +286,7 @@ static struct lu_device *mdc_device_alloc(const struct lu_env *env,
                 mc->mc_md_dev.md_ops = &mdc_md_ops;
                 ld = mdc2lu_dev(mc);
                 ld->ld_ops = &mdc_lu_ops;
-                sema_init(&mc->mc_fid_sem, 1);
+                cfs_sema_init(&mc->mc_fid_sem, 1);
         }
 
         RETURN (ld);
@@ -297,9 +297,9 @@ static struct lu_device *mdc_device_free(const struct lu_env *env,
 {
         struct mdc_device *mc = lu2mdc_dev(ld);
 
-        LASSERTF(atomic_read(&ld->ld_ref) == 0,
-                 "Refcount = %i\n", atomic_read(&ld->ld_ref));
-        LASSERT(list_empty(&mc->mc_linkage));
+        LASSERTF(cfs_atomic_read(&ld->ld_ref) == 0,
+                 "Refcount = %i\n", cfs_atomic_read(&ld->ld_ref));
+        LASSERT(cfs_list_empty(&mc->mc_linkage));
         md_device_fini(&mc->mc_md_dev);
         OBD_FREE_PTR(mc);
         return NULL;