Commit b5fdf66f authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Trond Myklebust
Browse files

NFS: Remove remaining dfprintks related to fscache and remove NFSDBG_FSCACHE 



The fscache cookie APIs including fscache_acquire_cookie() and
fscache_relinquish_cookie() now have very good tracing.  Thus,
there is no real need for dfprintks in the NFS fscache interface.

The NFS fscache interface has removed all dfprintks so remove the
NFSDBG_FSCACHE defines.

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent e3f0a7fe

fs/nfs/fscache.c

+0 −10
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ 
#include "fscache.h"

#include "nfstrace.h"



#define NFSDBG_FACILITY		NFSDBG_FSCACHE



#define NFS_MAX_KEY_LEN 1000



static bool nfs_append_int(char *key, int *_len, unsigned long long x)
@@ -129,8 +127,6 @@ int nfs_fscache_get_super_cookie(struct super_block *sb, const char *uniq, int u 
	vcookie = fscache_acquire_volume(key,

					 NULL, /* preferred_cache */

					 NULL, 0 /* coherency_data */);

	dfprintk(FSCACHE, "NFS: get superblock cookie (0x%p/0x%p)\n",

		 nfss, vcookie);

	if (IS_ERR(vcookie)) {

		if (vcookie != ERR_PTR(-EBUSY)) {

			kfree(key);
@@ -153,9 +149,6 @@ void nfs_fscache_release_super_cookie(struct super_block *sb) 
{

	struct nfs_server *nfss = NFS_SB(sb);



	dfprintk(FSCACHE, "NFS: releasing superblock cookie (0x%p/0x%p)\n",

		 nfss, nfss->fscache);



	fscache_relinquish_volume(nfss->fscache, NULL, false);

	nfss->fscache = NULL;

	kfree(nfss->fscache_uniq);
@@ -193,8 +186,6 @@ void nfs_fscache_clear_inode(struct inode *inode) 
	struct nfs_inode *nfsi = NFS_I(inode);

	struct fscache_cookie *cookie = nfs_i_fscache(inode);



	dfprintk(FSCACHE, "NFS: clear cookie (0x%p/0x%p)\n", nfsi, cookie);



	fscache_relinquish_cookie(cookie, false);

	nfsi->fscache = NULL;

}
@@ -229,7 +220,6 @@ void nfs_fscache_open_file(struct inode *inode, struct file *filp) 


	fscache_use_cookie(cookie, open_for_write);

	if (open_for_write) {

		dfprintk(FSCACHE, "NFS: nfsi 0x%p disabling cache\n", nfsi);

		nfs_fscache_update_auxdata(&auxdata, inode);

		fscache_invalidate(cookie, &auxdata, i_size_read(inode),

				   FSCACHE_INVAL_DIO_WRITE);

include/uapi/linux/nfs_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define NFSDBG_CALLBACK		0x0100

#define NFSDBG_CLIENT		0x0200

#define NFSDBG_MOUNT		0x0400

#define NFSDBG_FSCACHE		0x0800

#define NFSDBG_FSCACHE		0x0800 /* unused */

#define NFSDBG_PNFS		0x1000

#define NFSDBG_PNFS_LD		0x2000

#define NFSDBG_STATE		0x4000