LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec

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

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index 22d510a..bfa1bad 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * 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
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -27,7 +23,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, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,11 +36,7 @@
 
 #define DEBUG_SUBSYSTEM D_OTHER
 
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
-#include <obd_ost.h>
 #include <obd_support.h>
 #include <lustre_debug.h>
 #include <lustre_net.h>
@@ -52,24 +44,11 @@
 void dump_lniobuf(struct niobuf_local *nb)
 {
        CDEBUG(D_RPCTRACE,
-              "niobuf_local: file_offset="LPD64", len=%d, page=%p, rc=%d\n",
-              nb->lnb_file_offset, nb->len, nb->page, nb->rc);
+              "niobuf_local: file_offset=%lld, len=%d, page=%p, rc=%d\n",
+              nb->lnb_file_offset, nb->lnb_len, nb->lnb_page, nb->lnb_rc);
        CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n",
-                       nb->page ? cfs_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,
-              lsm->lsm_stripe_size, lsm->lsm_stripe_count,
-              cfs_atomic_read(&lsm->lsm_refc), lsm->lsm_layout_gen,
-              lsm->lsm_pool_name);
+              nb->lnb_page ? page_index(nb->lnb_page) : -1);
 }
-EXPORT_SYMBOL(dump_lsm);
 
 #define LPDS sizeof(__u64)
 int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
@@ -99,25 +78,25 @@ int block_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
         ne_off = le64_to_cpu (off);
         id = le64_to_cpu (id);
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" off: "LPX64" != "
-                       LPX64"\n", who, id, off, *(__u64 *)addr, ne_off);
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu off: %#llx != "
+                      "%#llx\n", who, id, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" id: "LPX64" != "LPX64"\n",
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu id: %#llx != %#llx\n",
                        who, id, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }
 
         addr += end - LPDS - LPDS;
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" end off: "LPX64" != "
-                       LPX64"\n", who, id, off, *(__u64 *)addr, ne_off);
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu end off: %#llx != "
+                      "%#llx\n", who, id, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" end id: "LPX64" != "
-                       LPX64"\n", who, id, off, *(__u64 *)(addr + LPDS), id);
+               CDEBUG(D_ERROR, "%s: id %#llx offset %llu end id: %#llx != "
+                      "%#llx\n", who, id, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }