LU-1346 libcfs: replace cfs_ memory wrappers

[fs/lustre-release.git] / lustre / obdclass / debug.c

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index 22d510a..055fe0e 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -55,16 +55,16 @@ void dump_lniobuf(struct niobuf_local *nb)
               "niobuf_local: file_offset="LPD64", len=%d, page=%p, rc=%d\n",
               nb->lnb_file_offset, nb->len, nb->page, nb->rc);
        CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n",
-                       nb->page ? cfs_page_index(nb->page) : -1);
+              nb->page ? page_index(nb->page) : -1);
 }
 EXPORT_SYMBOL(dump_lniobuf);
 
 void dump_lsm(int level, struct lov_stripe_md *lsm)
 {
-       CDEBUG(level, "lsm %p, objid "LPX64", maxbytes "LPX64", magic 0x%08X, "
-              "stripe_size %u, stripe_count %u, refc: %d, "
-              "layout_gen %u, pool ["LOV_POOLNAMEF"]\n", lsm,
-              lsm->lsm_object_id, lsm->lsm_maxbytes, lsm->lsm_magic,
+       CDEBUG(level, "lsm %p, objid "DOSTID", maxbytes "LPX64", magic 0x%08X,"
+              " stripe_size %u, stripe_count %u, refc: %d,"
+              " layout_gen %u, pool ["LOV_POOLNAMEF"]\n", lsm,
+              POSTID(&lsm->lsm_oi), lsm->lsm_maxbytes, lsm->lsm_magic,
               lsm->lsm_stripe_size, lsm->lsm_stripe_count,
               cfs_atomic_read(&lsm->lsm_refc), lsm->lsm_layout_gen,
               lsm->lsm_pool_name);