aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/nfs_fs.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-18 14:07:42 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-03-20 13:08:26 -0400
commite27d359e9b7e446190362cd5c8fe281d02194896 (patch)
tree5dece1801337b32e9d4ecc03e487a95856b413fa /include/linux/nfs_fs.h
parent3b3be88d67cc17d0f0ab6edaf131516793fc947e (diff)
SUNRPC/NFS: Add Kbuild dependencies for NFS_DEBUG/RPC_DEBUG
This allows us to turn on/off the dprintk() debugging interfaces for those distributions that don't ship the 'rpcdebug' utility. It also allows us to add Kbuild dependencies. Specifically, we already know that dprintk() in general relies on CONFIG_SYSCTL. Now it turns out that the NFS dprintks depend on CONFIG_CRC32 after we added support for the filehandle hash. Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'include/linux/nfs_fs.h')
-rw-r--r--include/linux/nfs_fs.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index 0a63ab2b5a76..8f27c2e36ddf 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -38,6 +38,13 @@
38 38
39#ifdef __KERNEL__ 39#ifdef __KERNEL__
40 40
41/*
42 * Enable dprintk() debugging support for nfs client.
43 */
44#ifdef CONFIG_NFS_DEBUG
45# define NFS_DEBUG
46#endif
47
41#include <linux/in.h> 48#include <linux/in.h>
42#include <linux/mm.h> 49#include <linux/mm.h>
43#include <linux/pagemap.h> 50#include <linux/pagemap.h>
@@ -391,7 +398,7 @@ static inline void nfs_free_fhandle(const struct nfs_fh *fh)
391 kfree(fh); 398 kfree(fh);
392} 399}
393 400
394#ifdef RPC_DEBUG 401#ifdef NFS_DEBUG
395extern u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh); 402extern u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh);
396static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh) 403static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
397{ 404{
@@ -650,14 +657,6 @@ nfs_fileid_to_ino_t(u64 fileid)
650 657
651#ifdef __KERNEL__ 658#ifdef __KERNEL__
652 659
653/*
654 * Enable debugging support for nfs client.
655 * Requires RPC_DEBUG.
656 */
657#ifdef RPC_DEBUG
658# define NFS_DEBUG
659#endif
660
661# undef ifdebug 660# undef ifdebug
662# ifdef NFS_DEBUG 661# ifdef NFS_DEBUG
663# define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac)) 662# define ifdebug(fac) if (unlikely(nfs_debug & NFSDBG_##fac))