From 5f674261764e8ec0be5ab64eed2a5808d097c55f Mon Sep 17 00:00:00 2001 From: "John L. Hammond" Date: Mon, 18 Aug 2014 11:50:34 -0500 Subject: [PATCH] LU-2675 lustre: remove linux/lustre_debug.h Move the definition of LL_CDEBUG_PAGE() to lustre/include/lustre_debug.h and remove lustre/include/linux/lustre_debug.h. Signed-off-by: John L. Hammond Change-Id: Ie5450ea76bfb1abeef8256da27aac5ea3009a1f2 Reviewed-on: http://review.whamcloud.com/11496 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Bob Glossman Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/include/linux/Makefile.am | 2 +- lustre/include/linux/lustre_debug.h | 47 ------------------------------------- lustre/include/lustre_debug.h | 5 +++- 3 files changed, 5 insertions(+), 49 deletions(-) delete mode 100644 lustre/include/linux/lustre_debug.h diff --git a/lustre/include/linux/Makefile.am b/lustre/include/linux/Makefile.am index b0e311d..1aab399 100644 --- a/lustre/include/linux/Makefile.am +++ b/lustre/include/linux/Makefile.am @@ -42,7 +42,7 @@ if UTILS linux_HEADERS = lustre_user.h endif -EXTRA_DIST = lustre_debug.h lustre_lib.h \ +EXTRA_DIST = lustre_lib.h \ lustre_dlm.h lustre_handles.h lustre_net.h obd_class.h obd_support.h \ obd.h lvfs.h lustre_log.h lustre_compat25.h lustre_lite.h lustre_quota.h \ lustre_user.h lustre_patchless_compat.h lustre_intent.h diff --git a/lustre/include/linux/lustre_debug.h b/lustre/include/linux/lustre_debug.h deleted file mode 100644 index bc334be..0000000 --- a/lustre/include/linux/lustre_debug.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * GPL HEADER START - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * 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. - * - * 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). - * - * 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. - * - * GPL HEADER END - */ -/* - * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. - * Use is subject to license terms. - */ -/* - * This file is part of Lustre, http://www.lustre.org/ - * Lustre is a trademark of Sun Microsystems, Inc. - */ - -#ifndef _LINUX_LUSTRE_DEBUG_H -#define _LINUX_LUSTRE_DEBUG_H - -#ifndef _LUSTRE_DEBUG_H -#error Do not #include this file directly. #include instead -#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) - -#endif diff --git a/lustre/include/lustre_debug.h b/lustre/include/lustre_debug.h index 0bfb7c6..ad833e2 100644 --- a/lustre/include/lustre_debug.h +++ b/lustre/include/lustre_debug.h @@ -45,7 +45,10 @@ #include #include -#include +#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) \ -- 1.8.3.1