LU-3556 osd-ldiskfs: remove dependency on mdd module

[fs/lustre-release.git] / lustre / osc / osc_object.c

diff --git a/lustre/osc/osc_object.c b/lustre/osc/osc_object.c
index 5f577ea..8d6eec6 100644 (file)
--- a/lustre/osc/osc_object.c
+++ b/lustre/osc/osc_object.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Whamcloud, Inc.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -77,10 +77,10 @@ static int osc_object_init(const struct lu_env *env, struct lu_object *obj,
         int i;
 
         osc->oo_oinfo = cconf->u.coc_oinfo;
-#ifdef INVARIANT_CHECK
-        cfs_mutex_init(&osc->oo_debug_mutex);
+#ifdef CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK
+       mutex_init(&osc->oo_debug_mutex);
 #endif
-        cfs_spin_lock_init(&osc->oo_seatbelt);
+       spin_lock_init(&osc->oo_seatbelt);
         for (i = 0; i < CRT_NR; ++i)
                 CFS_INIT_LIST_HEAD(&osc->oo_inflight[i]);
 
@@ -96,7 +96,9 @@ static int osc_object_init(const struct lu_env *env, struct lu_object *obj,
        CFS_INIT_LIST_HEAD(&osc->oo_reading_exts);
        cfs_atomic_set(&osc->oo_nr_reads, 0);
        cfs_atomic_set(&osc->oo_nr_writes, 0);
-       cfs_spin_lock_init(&osc->oo_lock);
+       spin_lock_init(&osc->oo_lock);
+
+       cl_object_page_init(lu2cl(obj), sizeof(struct osc_page));
 
        return 0;
 }
@@ -138,18 +140,18 @@ int osc_lvb_print(const struct lu_env *env, void *cookie,
 static int osc_object_print(const struct lu_env *env, void *cookie,
                             lu_printer_t p, const struct lu_object *obj)
 {
-        struct osc_object   *osc   = lu2osc(obj);
-        struct lov_oinfo    *oinfo = osc->oo_oinfo;
-        struct osc_async_rc *ar    = &oinfo->loi_ar;
-
-        (*p)(env, cookie, "id: "LPU64" gr: "LPU64" "
-             "idx: %d gen: %d kms_valid: %u kms "LPU64" "
-             "rc: %d force_sync: %d min_xid: "LPU64" ",
-             oinfo->loi_id, oinfo->loi_seq, oinfo->loi_ost_idx,
-             oinfo->loi_ost_gen, oinfo->loi_kms_valid, oinfo->loi_kms,
-             ar->ar_rc, ar->ar_force_sync, ar->ar_min_xid);
-        osc_lvb_print(env, cookie, p, &oinfo->loi_lvb);
-        return 0;
+       struct osc_object   *osc   = lu2osc(obj);
+       struct lov_oinfo    *oinfo = osc->oo_oinfo;
+       struct osc_async_rc *ar    = &oinfo->loi_ar;
+
+       (*p)(env, cookie, "id: "DOSTID" "
+            "idx: %d gen: %d kms_valid: %u kms "LPU64" "
+            "rc: %d force_sync: %d min_xid: "LPU64" ",
+            POSTID(&oinfo->loi_oi), oinfo->loi_ost_idx,
+            oinfo->loi_ost_gen, oinfo->loi_kms_valid, oinfo->loi_kms,
+            ar->ar_rc, ar->ar_force_sync, ar->ar_min_xid);
+       osc_lvb_print(env, cookie, p, &oinfo->loi_lvb);
+       return 0;
 }
 
 
@@ -262,7 +264,7 @@ struct lu_object *osc_object_alloc(const struct lu_env *env,
         struct osc_object *osc;
         struct lu_object  *obj;
 
-        OBD_SLAB_ALLOC_PTR_GFP(osc, osc_object_kmem, CFS_ALLOC_IO);
+       OBD_SLAB_ALLOC_PTR_GFP(osc, osc_object_kmem, __GFP_IO);
         if (osc != NULL) {
                 obj = osc2lu(osc);
                 lu_object_init(obj, NULL, dev);