[pnfs] CVS: nfsv4

[Benny Halevy Panasas]

CVSROOT:	/cvs
Module name:	nfsv4
Changes by:	bhalevy at citi.	2007/01/03 13:44:41

Modified files:
	cvs/pnfs/include/linux: nfs_fs.h 

Log message:
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 at panasas.com>

Index: include/linux/nfs_fs.h
===================================================================
RCS file: /cvs/nfsv4/cvs/pnfs/include/linux/nfs_fs.h,v
retrieving revision 1.19
diff -d -u -p -r1.19 nfs_fs.h
--- include/linux/nfs_fs.h	3 Jan 2007 13:18:17 -0000	1.19
+++ include/linux/nfs_fs.h	3 Jan 2007 18:27:12 -0000
@@ -9,14 +9,6 @@
#ifndef _LINUX_NFS_FS_H
#define _LINUX_NFS_FS_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)
@@ -630,6 +622,14 @@ extern void * nfs_root_data(void);
#define NFSDBG_FILELAYOUT	0x0800
#define NFSDBG_ODIRECT		0x1000
#define NFSDBG_ALL		0xFFFF
+
+/*
+ * Enable debugging support for nfs client.
+ * Requires RPC_DEBUG.
+ */
+#ifdef RPC_DEBUG
+# define NFS_DEBUG
+#endif

#ifdef __KERNEL__
# undef ifdebug