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

Commit 1d98fe67 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Move dprintks from callback.c to callback_proc.c 



Clean up: The client side peer address is available in callback_proc.c,
so move a dprintk out of fs/nfs/callback.c and into
fs/nfs/callback_proc.c.

This is more consistent with other debugging messages, and the proc
routines have more information about each request to display.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 5d8515ca

fs/nfs/callback.c

+0 −4
Original line number Diff line number Diff line
@@ -73,8 +73,6 @@ static void nfs_callback_svc(struct svc_rqst *rqstp) 
	complete(&nfs_callback_info.started);



	for(;;) {

		char buf[RPC_MAX_ADDRBUFLEN];



		if (signalled()) {

			if (nfs_callback_info.users == 0)

				break;
@@ -92,8 +90,6 @@ static void nfs_callback_svc(struct svc_rqst *rqstp) 
					__FUNCTION__, -err);

			break;

		}

		dprintk("%s: request from %s\n", __FUNCTION__,

				svc_print_addr(rqstp, buf, sizeof(buf)));

		svc_process(rqstp);

	}

fs/nfs/callback_proc.c

+11 −1
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ 
#include "delegation.h"

#include "internal.h"



#ifdef NFS_DEBUG

#define NFSDBG_FACILITY NFSDBG_CALLBACK

#endif

 

__be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres *res)

{
@@ -26,6 +28,10 @@ __be32 nfs4_callback_getattr(struct cb_getattrargs *args, struct cb_getattrres * 
	clp = nfs_find_client(args->addr, 4);

	if (clp == NULL)

		goto out;



	dprintk("NFS: GETATTR callback request from %s\n",

		rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR));



	inode = nfs_delegation_find_inode(clp, &args->fh);

	if (inode == NULL)

		goto out_putclient;
@@ -65,6 +71,10 @@ __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy) 
	clp = nfs_find_client(args->addr, 4);

	if (clp == NULL)

		goto out;



	dprintk("NFS: RECALL callback request from %s\n",

		rpc_peeraddr2str(clp->cl_rpcclient, RPC_DISPLAY_ADDR));



	inode = nfs_delegation_find_inode(clp, &args->fh);

	if (inode == NULL)

		goto out_putclient;