X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_debug.h;h=770b3c7ec06ec301dce2cad3c2c2f2fcce80585f;hb=2f66b4903516f93356f1a525f78474af25041353;hp=cdb2f9dbf8ca9bcb1ed9fcc0adb6960d55730aef;hpb=1b2547843817b4b7adbeb87ea9b070d9cac35c90;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_debug.h b/lustre/include/lustre_debug.h
index cdb2f9d..770b3c7 100644
--- a/lustre/include/lustre_debug.h
+++ b/lustre/include/lustre_debug.h
@@ -27,7 +27,7 @@
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, Intel Corporation.
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,15 +45,10 @@
 #include <lustre_net.h>
 #include <obd.h>
 
-#if defined(__linux__)
-#include <linux/lustre_debug.h>
-#elif defined(__APPLE__)
-#include <darwin/lustre_debug.h>
-#elif defined(__WINNT__)
-#include <winnt/lustre_debug.h>
-#else
-#error Unsupported operating system.
-#endif
+#define LL_CDEBUG_PAGE(mask, page, fmt, arg...)				\
+	CDEBUG(mask, "page %p map %p index %lu flags %lx count %u priv %0lx: " \
+	       fmt, page, page->mapping, page->index, (long)page->flags, \
+	       page_count(page), page_private(page), ## arg)
 
 #define ASSERT_MAX_SIZE_MB 60000ULL
 #define ASSERT_PAGE_INDEX(index, OP)                                    \
@@ -75,7 +70,6 @@ do { if (offset > ASSERT_MAX_SIZE_MB << 20) {                           \
 /* lib/debug.c */
 void dump_lniobuf(struct niobuf_local *lnb);
 int dump_req(struct ptlrpc_request *req);
-void dump_lsm(int level, struct lov_stripe_md *lsm);
 int block_debug_setup(void *addr, int len, __u64 off, __u64 id);
 int block_debug_check(char *who, void *addr, int len, __u64 off, __u64 id);