X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_debug.h;h=bf67e6816a77e0179354f231f5b976c628e195bc;hb=478f97b212714bc3af9a9a104efab314ca942758;hp=c6bd7bab5d0c978c2e3cc24912baf1eea93892f5;hpb=113303973ec9f8484eb2355a1a6ef3c4c7fd6a56;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_debug.h b/lustre/include/lustre_debug.h
index c6bd7ba..bf67e68 100644
--- a/lustre/include/lustre_debug.h
+++ b/lustre/include/lustre_debug.h
@@ -1,64 +1,74 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
+/*
+ * GPL HEADER START
  *
- *  Copyright (C) 2002 Cluster File Systems, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *   This file is part of Lustre, http://www.lustre.org.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
  *
- *   Lustre is free software; you can redistribute it and/or
- *   modify it under the terms of version 2 of the GNU General Public
- *   License as published by the Free Software Foundation.
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
  *
- *   Lustre is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
- *   You should have received a copy of the GNU General Public License
- *   along with Lustre; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * 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/
+ * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 #ifndef _LUSTRE_DEBUG_H
 #define _LUSTRE_DEBUG_H
 
+/** \defgroup debug debug
+ *
+ * @{
+ */
+
 #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;                                                             \
 }} while(0)
 
 /* lib/debug.c */
-int dump_lniobuf(struct niobuf_local *lnb);
-int dump_rniobuf(struct niobuf_remote *rnb);
-int dump_ioo(struct obd_ioobj *nb);
+void dump_lniobuf(struct niobuf_local *lnb);
 int dump_req(struct ptlrpc_request *req);
-int dump_obdo(struct obdo *oa);
-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);
+
+/** @} debug */
+
 #endif