Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Dave Wysochanski <dwysocha@redhat.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

authored by

Dave Wysochanski and committed by
Trond Myklebust
b5fdf66f e3f0a7fe

+1 -11
-10
fs/nfs/fscache.c
··· 21 21 #include "fscache.h" 22 22 #include "nfstrace.h" 23 23 24 - #define NFSDBG_FACILITY NFSDBG_FSCACHE 25 - 26 24 #define NFS_MAX_KEY_LEN 1000 27 25 28 26 static bool nfs_append_int(char *key, int *_len, unsigned long long x) ··· 127 129 vcookie = fscache_acquire_volume(key, 128 130 NULL, /* preferred_cache */ 129 131 NULL, 0 /* coherency_data */); 130 - dfprintk(FSCACHE, "NFS: get superblock cookie (0x%p/0x%p)\n", 131 - nfss, vcookie); 132 132 if (IS_ERR(vcookie)) { 133 133 if (vcookie != ERR_PTR(-EBUSY)) { 134 134 kfree(key); ··· 148 152 void nfs_fscache_release_super_cookie(struct super_block *sb) 149 153 { 150 154 struct nfs_server *nfss = NFS_SB(sb); 151 - 152 - dfprintk(FSCACHE, "NFS: releasing superblock cookie (0x%p/0x%p)\n", 153 - nfss, nfss->fscache); 154 155 155 156 fscache_relinquish_volume(nfss->fscache, NULL, false); 156 157 nfss->fscache = NULL; ··· 186 193 struct nfs_inode *nfsi = NFS_I(inode); 187 194 struct fscache_cookie *cookie = nfs_i_fscache(inode); 188 195 189 - dfprintk(FSCACHE, "NFS: clear cookie (0x%p/0x%p)\n", nfsi, cookie); 190 - 191 196 fscache_relinquish_cookie(cookie, false); 192 197 nfsi->fscache = NULL; 193 198 } ··· 220 229 221 230 fscache_use_cookie(cookie, open_for_write); 222 231 if (open_for_write) { 223 - dfprintk(FSCACHE, "NFS: nfsi 0x%p disabling cache\n", nfsi); 224 232 nfs_fscache_update_auxdata(&auxdata, inode); 225 233 fscache_invalidate(cookie, &auxdata, i_size_read(inode), 226 234 FSCACHE_INVAL_DIO_WRITE);
+1 -1
include/uapi/linux/nfs_fs.h
··· 52 52 #define NFSDBG_CALLBACK 0x0100 53 53 #define NFSDBG_CLIENT 0x0200 54 54 #define NFSDBG_MOUNT 0x0400 55 - #define NFSDBG_FSCACHE 0x0800 55 + #define NFSDBG_FSCACHE 0x0800 /* unused */ 56 56 #define NFSDBG_PNFS 0x1000 57 57 #define NFSDBG_PNFS_LD 0x2000 58 58 #define NFSDBG_STATE 0x4000