Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e27d359e authored by Trond Myklebust's avatar Trond Myklebust
Browse files

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: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 3b3be88d

fs/nfs/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -144,3 +144,9 @@ config NFS_USE_KERNEL_DNS 
	depends on NFS_V4 && !NFS_USE_LEGACY_DNS

	select DNS_RESOLVER

	default y



config NFS_DEBUG

	bool

	depends on NFS_FS && SUNRPC_DEBUG

	select CRC32

	default y

fs/nfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,7 @@ struct nfs_fh *nfs_alloc_fhandle(void) 
	return fh;

}



#ifdef RPC_DEBUG

#ifdef NFS_DEBUG

/*

 * _nfs_display_fhandle_hash - calculate the crc32 hash for the filehandle

 *                             in the same way that wireshark does

fs/nfs/mount_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/nfs_fs.h>

#include "internal.h"



#ifdef RPC_DEBUG

#ifdef NFS_DEBUG

# define NFSDBG_FACILITY	NFSDBG_MOUNT

#endif

fs/nfs/nfsroot.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static char nfs_export_path[NFS_MAXPATHLEN + 1] __initdata = ""; 
/* server:export path string passed to super.c */

static char nfs_root_device[NFS_MAXPATHLEN + 1] __initdata = "";



#ifdef RPC_DEBUG

#ifdef NFS_DEBUG

/*

 * When the "nfsrootdebug" kernel command line option is specified,

 * enable debugging messages for NFSROOT.

include/linux/nfs_fs.h

+8 −9
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ 


#ifdef __KERNEL__



/*

 * Enable dprintk() debugging support for nfs client.

 */

#ifdef CONFIG_NFS_DEBUG

# define NFS_DEBUG

#endif



#include <linux/in.h>

#include <linux/mm.h>

#include <linux/pagemap.h>
@@ -391,7 +398,7 @@ static inline void nfs_free_fhandle(const struct nfs_fh *fh) 
	kfree(fh);

}



#ifdef RPC_DEBUG

#ifdef NFS_DEBUG

extern u32 _nfs_display_fhandle_hash(const struct nfs_fh *fh);

static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)

{
@@ -650,14 +657,6 @@ nfs_fileid_to_ino_t(u64 fileid) 


#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))