Skip to content

Commit

Permalink
NFS: move NFS_DEBUG definition
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benny Halevy authored and Trond Myklebust committed Feb 3, 2007
1 parent e148582 commit 4dc2eae
Showing 1 changed file with 9 additions and 8 deletions.
17 changes: 9 additions & 8 deletions include/linux/nfs_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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))
Expand Down

0 comments on commit 4dc2eae

Please sign in to comment.