Here's a series of patches to make SunRPC/NFS use no_printk() to implement its null dfprintk() macro (ie. when RPC_DEBUG is disabled). This prevents 'unused variable' errors from occurring when a variable is set only for use in debugging statements and renders RPC/NFS_IFDEBUG unnecessary. David --- David Howells (4): SunRPC: Use the standard varargs macro method for dfprintk() and co. SunRPC: Declare and use rpc_task_pid() to wrap task->tk_pid SunRPC: Use no_printk() for the null dprintk() and dfprintk() SunRPC: Kill RPC_IFDEBUG() and NFS_IFDEBUG() fs/lockd/clntproc.c | 2 + fs/lockd/svc.c | 6 ++- fs/lockd/svc4proc.c | 2 + fs/lockd/svclock.c | 6 ++- fs/lockd/svcproc.c | 2 + fs/nfs/direct.c | 6 ++- fs/nfs/fscache.c | 2 + fs/nfs/nfs4filelayout.c | 8 ++-- fs/nfs/nfs4proc.c | 2 + fs/nfs/read.c | 4 +- fs/nfs/write.c | 8 ++-- fs/nfsd/nfs4proc.c | 6 +-- fs/nfsd/nfsfh.c | 10 +++--- include/linux/nfs_fs.h | 2 - include/linux/sunrpc/debug.h | 39 ++++++++++------------ include/linux/sunrpc/sched.h | 20 ++++++++--- include/trace/events/sunrpc.h | 8 ++-- net/sunrpc/auth.c | 18 +++++----- net/sunrpc/auth_gss/auth_gss.c | 20 ++++++----- net/sunrpc/clnt.c | 72 ++++++++++++++++++++-------------------- net/sunrpc/rpcb_clnt.c | 34 +++++++++---------- net/sunrpc/sched.c | 39 +++++++++------------- net/sunrpc/svcsock.c | 33 +++++++++++------- net/sunrpc/xprt.c | 30 ++++++++--------- net/sunrpc/xprtsock.c | 2 + 25 files changed, 194 insertions(+), 187 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html