Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa3bee0d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

lustre: delete linux/lustre_debug.h 



There was only one macro in here, LL_CDEBUG_PAGE().  So open code it in
the 2 places it was used so that the developer seeing it can see just
how horrid it really is, and they can remove it as I doubt it really is
ever needed anymore.  But for now, keep the same functionality and
remove a whole file (with a duplicate name of other files in the lustre
repo, another confusion...)

Cc: Peng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 187df692

drivers/staging/lustre/lustre/include/linux/lustre_debug.h

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * 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 <lprocfs_status.h> 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

drivers/staging/lustre/lustre/include/lustre_debug.h

+0 −2
Original line number Diff line number Diff line
@@ -45,8 +45,6 @@ 
#include <lustre_net.h>

#include <obd.h>



#include <linux/lustre_debug.h>



/* lib/debug.c */

void dump_lniobuf(struct niobuf_local *lnb);

int dump_req(struct ptlrpc_request *req);

drivers/staging/lustre/lustre/llite/vvp_io.c

+5 −2
Original line number Diff line number Diff line
@@ -628,8 +628,11 @@ static int vvp_io_kernel_fault(struct vvp_fault_io *cfio) 
	cfio->fault.ft_flags = filemap_fault(cfio->ft_vma, vmf);



	if (vmf->page) {

		LL_CDEBUG_PAGE(D_PAGE, vmf->page, "got addr %p type NOPAGE\n",

			       vmf->virtual_address);

		CDEBUG(D_PAGE,

		       "page %p map %p index %lu flags %lx count %u priv %0lx: got addr %p type NOPAGE\n",

		       vmf->page, vmf->page->mapping, vmf->page->index,

		       (long)vmf->page->flags, page_count(vmf->page),

		       page_private(vmf->page), vmf->virtual_address);

		if (unlikely(!(cfio->fault.ft_flags & VM_FAULT_LOCKED))) {

			lock_page(vmf->page);

			cfio->fault.ft_flags &= VM_FAULT_LOCKED;

drivers/staging/lustre/lustre/osc/osc_request.c

+6 −2
Original line number Diff line number Diff line
@@ -1193,7 +1193,11 @@ static obd_count osc_checksum_bulk(int nob, obd_count pg_count, 
		cfs_crypto_hash_update_page(hdesc, pga[i]->pg,

				  pga[i]->off & ~CFS_PAGE_MASK,

				  count);

		LL_CDEBUG_PAGE(D_PAGE, pga[i]->pg, "off %d\n",

		CDEBUG(D_PAGE,

		       "page %p map %p index %lu flags %lx count %u priv %0lx: off %d\n",

		       pga[i]->pg, pga[i]->pg->mapping, pga[i]->pg->index,

		       (long)pga[i]->pg->flags, page_count(pga[i]->pg),

		       page_private(pga[i]->pg),

		       (int)(pga[i]->off & ~CFS_PAGE_MASK));



		nob -= pga[i]->count;