X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_debug.h;h=bf67e6816a77e0179354f231f5b976c628e195bc;hb=72057a3af19ee02d9a686bd7e7d074917e381310;hp=6662f487dfa068cf777d1e4b1433f01757156f4f;hpb=f95393b0d0a59cf3dc2f29cffc35dcc4cc9d7728;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_debug.h b/lustre/include/lustre_debug.h
index 6662f48..bf67e68 100644
--- a/lustre/include/lustre_debug.h
+++ b/lustre/include/lustre_debug.h
@@ -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.
@@ -17,17 +15,15 @@
  *
  * 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
  */
 /*
  * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2011, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -45,28 +41,23 @@
 #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)                                    \
-do { if (index > ASSERT_MAX_SIZE_MB << (20 - CFS_PAGE_SHIFT)) {         \
-        CERROR("bad page index %lu > %Lu\n", index,                     \
-               ASSERT_MAX_SIZE_MB << (20 - CFS_PAGE_SHIFT));            \
+do { if (index > ASSERT_MAX_SIZE_MB << (20 - PAGE_SHIFT)) {         \
+        CERROR("bad page index %lu > %llu\n", index,                    \
+	       ASSERT_MAX_SIZE_MB << (20 - PAGE_SHIFT));            \
         libcfs_debug = ~0UL;                                            \
         OP;                                                             \
 }} while(0)
 
 #define ASSERT_FILE_OFFSET(offset, OP)                                  \
 do { if (offset > ASSERT_MAX_SIZE_MB << 20) {                           \
-        CERROR("bad file offset %Lu > %Lu\n", offset,                   \
+        CERROR("bad file offset %llu > %llu\n", offset,                 \
                ASSERT_MAX_SIZE_MB << 20);                               \
         libcfs_debug = ~0UL;                                            \
         OP;                                                             \
@@ -75,7 +66,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);