Commit 4dc2eaec authored Dec 20, 2006 by Benny Halevy Committed by Trond Myklebust Feb 03, 2007

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>

parent e148582e

include/linux/nfs_fs.h

+9 −8

Original line number	Diff line number	Diff line
		@@ -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))