NFS: move NFS_DEBUG definition
Trond, looks like the changes to include/linux/nfs_fs.h in 2.6.18 that moved the #include's of sunrpc header files into the #ifdef __KERNEL__ block disabled nfs debugging for all nfs c file not including any sunrpc header. The following patch moves the definition down, right before its use for defining ifdebug. Signed-off-by: Benny Halevy <bhalevy@panasas.com> (Moved definition further down into the __KERNEL__ section: Trond) Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
parent
e148582e10
commit
4dc2eaecd4
|
@ -11,14 +11,6 @@
|
|||
|
||||
#include <linux/magic.h>
|
||||
|
||||
/*
|
||||
* Enable debugging support for nfs client.
|
||||
* Requires RPC_DEBUG.
|
||||
*/
|
||||
#ifdef RPC_DEBUG
|
||||
# define NFS_DEBUG
|
||||
#endif
|
||||
|
||||
/* Default timeout values */
|
||||
#define NFS_MAX_UDP_TIMEOUT (60*HZ)
|
||||
#define NFS_MAX_TCP_TIMEOUT (600*HZ)
|
||||
|
@ -567,6 +559,15 @@ extern void * nfs_root_data(void);
|
|||
#define NFSDBG_ALL 0xFFFF
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
/*
|
||||
* Enable debugging support for nfs client.
|
||||
* Requires RPC_DEBUG.
|
||||
*/
|
||||
#ifdef RPC_DEBUG
|
||||
# define NFS_DEBUG
|
||||
#endif
|
||||
|
||||
# undef ifdebug
|
||||
# ifdef NFS_DEBUG
|
||||
# define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac))
|
||||
|
|
Loading…
Reference in a new issue