mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
f96637be08
It's not obvious from reading the macro names that these macros are for debugging. Convert the names to a single more typical kernel style cifs_dbg macro. cERROR(1, ...) -> cifs_dbg(VFS, ...) cFYI(1, ...) -> cifs_dbg(FYI, ...) cFYI(DBG2, ...) -> cifs_dbg(NOISY, ...) Move the terminating format newline from the macro to the call site. Add CONFIG_CIFS_DEBUG function cifs_vfs_err to emit the "CIFS VFS: " prefix for VFS messages. Size is reduced ~ 1% when CONFIG_CIFS_DEBUG is set (default y) $ size fs/cifs/cifs.ko* text data bss dec hex filename 265245 2525 132 267902 4167e fs/cifs/cifs.ko.new 268359 2525 132 271016 422a8 fs/cifs/cifs.ko.old Other miscellaneous changes around these conversions: o Miscellaneous typo fixes o Add terminating \n's to almost all formats and remove them from the macros to be more kernel style like. A few formats previously had defective \n's o Remove unnecessary OOM messages as kmalloc() calls dump_stack o Coalesce formats to make grep easier, added missing spaces when coalescing formats o Use %s, __func__ instead of embedded function name o Removed unnecessary "cifs: " prefixes o Convert kzalloc with multiply to kcalloc o Remove unused cifswarn macro Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jeff Layton <jlayton@redhat.com> Signed-off-by: Steve French <smfrench@gmail.com>
78 lines
2.1 KiB
C
78 lines
2.1 KiB
C
/*
|
|
*
|
|
* Copyright (c) International Business Machines Corp., 2000,2002
|
|
* Modified by Steve French (sfrench@us.ibm.com)
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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 for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#ifndef _H_CIFS_DEBUG
|
|
#define _H_CIFS_DEBUG
|
|
|
|
void cifs_dump_mem(char *label, void *data, int length);
|
|
void cifs_dump_detail(void *);
|
|
void cifs_dump_mids(struct TCP_Server_Info *);
|
|
extern int traceSMB; /* flag which enables the function below */
|
|
void dump_smb(void *, int);
|
|
#define CIFS_INFO 0x01
|
|
#define CIFS_RC 0x02
|
|
#define CIFS_TIMER 0x04
|
|
|
|
#define VFS 1
|
|
#define FYI 2
|
|
extern int cifsFYI;
|
|
#ifdef CONFIG_CIFS_DEBUG2
|
|
#define NOISY 4
|
|
#else
|
|
#define NOISY 0
|
|
#endif
|
|
|
|
/*
|
|
* debug ON
|
|
* --------
|
|
*/
|
|
#ifdef CONFIG_CIFS_DEBUG
|
|
|
|
__printf(1, 2) void cifs_vfs_err(const char *fmt, ...);
|
|
|
|
/* information message: e.g., configuration, major event */
|
|
#define cifs_dbg(type, fmt, ...) \
|
|
do { \
|
|
if (type == FYI) { \
|
|
if (cifsFYI & CIFS_INFO) { \
|
|
printk(KERN_DEBUG "%s: " fmt, \
|
|
__FILE__, ##__VA_ARGS__); \
|
|
} \
|
|
} else if (type == VFS) { \
|
|
cifs_vfs_err(fmt, ##__VA_ARGS__); \
|
|
} else if (type == NOISY && type != 0) { \
|
|
printk(KERN_DEBUG fmt, ##__VA_ARGS__); \
|
|
} \
|
|
} while (0)
|
|
|
|
/*
|
|
* debug OFF
|
|
* ---------
|
|
*/
|
|
#else /* _CIFS_DEBUG */
|
|
#define cifs_dbg(type, fmt, ...) \
|
|
do { \
|
|
if (0) \
|
|
printk(KERN_DEBUG fmt, ##__VA_ARGS__); \
|
|
} while (0)
|
|
#endif
|
|
|
|
#endif /* _H_CIFS_DEBUG */
|