X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fdebug.c;h=9f9c0a4f8b7ed0af92176d797c3750175a33e342;hb=05b6528d2dc6f0b6b7647a2a3fd05bedd8b30f29;hp=b321f945b8292c012cbffca4261eb5193448ea50;hpb=0f8dca08a4f68cba82c2c822998ecc309d3b7aaf;p=fs%2Flustre-release.git

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index b321f94..9f9c0a4 100644
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,6 +26,8 @@
 /*
  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,37 +40,21 @@
 
 #define DEBUG_SUBSYSTEM D_OTHER
 
-#ifndef EXPORT_SYMTAB
-# define EXPORT_SYMTAB
-#endif
-#ifndef __KERNEL__
-# include <liblustre.h>
-#endif
 
-#include <obd_ost.h>
 #include <obd_support.h>
 #include <lustre_debug.h>
 #include <lustre_net.h>
 
 void dump_lniobuf(struct niobuf_local *nb)
 {
-        CDEBUG(D_RPCTRACE,
-               "niobuf_local: offset="LPD64", len=%d, page=%p, rc=%d\n",
-               nb->offset, nb->len, nb->page, nb->rc);
-        CDEBUG(D_RPCTRACE, "nb->page: index = %ld\n",
-               nb->page ? cfs_page_index(nb->page) : -1);
+	CDEBUG(D_RPCTRACE,
+	       "niobuf_local: file_offset="LPD64", 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->lnb_page ? page_index(nb->lnb_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 pool "LOV_POOLNAMEF"\n", lsm,
-               lsm->lsm_object_id, lsm->lsm_maxbytes, lsm->lsm_magic,
-               lsm->lsm_stripe_size, lsm->lsm_stripe_count,
-               lsm->lsm_pool_name);
-}
-
 #define LPDS sizeof(__u64)
 int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
 {
@@ -87,6 +71,7 @@ int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
 
         return 0;
 }
+EXPORT_SYMBOL(block_debug_setup);
 
 int block_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
 {
@@ -122,9 +107,5 @@ int block_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
 
         return err;
 }
-#undef LPDS
-
-//EXPORT_SYMBOL(dump_req);
-EXPORT_SYMBOL(dump_lsm);
-EXPORT_SYMBOL(block_debug_setup);
 EXPORT_SYMBOL(block_debug_check);
+#undef LPDS