LU-12542 handles: discard h_owner in favour of h_ops

[fs/lustre-release.git] / lustre / include / lustre_debug.h

diff --git a/lustre/include/lustre_debug.h b/lustre/include/lustre_debug.h
index f7e5173..bf67e68 100644 (file)
--- a/lustre/include/lustre_debug.h
+++ b/lustre/include/lustre_debug.h
@@ -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) 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,21 +41,16 @@
 #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 - PAGE_CACHE_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_CACHE_SHIFT));            \
+              ASSERT_MAX_SIZE_MB << (20 - PAGE_SHIFT));            \
         libcfs_debug = ~0UL;                                            \
         OP;                                                             \
 }} while(0)