diff options
author | Benny Halevy <bhalevy@panasas.com> | 2006-12-20 15:29:46 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-03 18:35:09 -0500 |
commit | 4dc2eaecd4cf0687727e418540bccf956a62ebcf (patch) | |
tree | 294d9f4f161bd4e9b30f2870c13fddb9ead13a8b /include/linux/nfs_fs.h | |
parent | e148582e10a2c1a23dfc09210df4a18bc6cca4e9 (diff) |
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>
Diffstat (limited to 'include/linux/nfs_fs.h')
-rw-r--r-- | include/linux/nfs_fs.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index c5d4084773e8..c0d03767b8c4 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -11,14 +11,6 @@ | |||
11 | 11 | ||
12 | #include <linux/magic.h> | 12 | #include <linux/magic.h> |
13 | 13 | ||
14 | /* | ||
15 | * Enable debugging support for nfs client. | ||
16 | * Requires RPC_DEBUG. | ||
17 | */ | ||
18 | #ifdef RPC_DEBUG | ||
19 | # define NFS_DEBUG | ||
20 | #endif | ||
21 | |||
22 | /* Default timeout values */ | 14 | /* Default timeout values */ |
23 | #define NFS_MAX_UDP_TIMEOUT (60*HZ) | 15 | #define NFS_MAX_UDP_TIMEOUT (60*HZ) |
24 | #define NFS_MAX_TCP_TIMEOUT (600*HZ) | 16 | #define NFS_MAX_TCP_TIMEOUT (600*HZ) |
@@ -567,6 +559,15 @@ extern void * nfs_root_data(void); | |||
567 | #define NFSDBG_ALL 0xFFFF | 559 | #define NFSDBG_ALL 0xFFFF |
568 | 560 | ||
569 | #ifdef __KERNEL__ | 561 | #ifdef __KERNEL__ |
562 | |||
563 | /* | ||
564 | * Enable debugging support for nfs client. | ||
565 | * Requires RPC_DEBUG. | ||
566 | */ | ||
567 | #ifdef RPC_DEBUG | ||
568 | # define NFS_DEBUG | ||
569 | #endif | ||
570 | |||
570 | # undef ifdebug | 571 | # undef ifdebug |
571 | # ifdef NFS_DEBUG | 572 | # ifdef NFS_DEBUG |
572 | # define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac)) | 573 | # define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac)) |