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

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

lockd: Move nlmdbg_cookie2a() to svclock.c 



Clean up.  nlmdbg_cookie2a() is used only in svclock.c.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarJ. Bruce Fields <bfields@redhat.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 7d93bd71

fs/lockd/svclock.c

+30 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ static void nlmsvc_remove_block(struct nlm_block *block); 
static int nlmsvc_setgrantargs(struct nlm_rqst *call, struct nlm_lock *lock);

static void nlmsvc_freegrantargs(struct nlm_rqst *call);

static const struct rpc_call_ops nlmsvc_grant_ops;

static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie);



/*

 * The list of blocked locks to retry
@@ -934,3 +935,32 @@ nlmsvc_retry_blocked(void) 


	return timeout;

}



#ifdef RPC_DEBUG

static const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)

{

	/*

	 * We can get away with a static buffer because we're only

	 * called with BKL held.

	 */

	static char buf[2*NLM_MAXCOOKIELEN+1];

	unsigned int i, len = sizeof(buf);

	char *p = buf;



	len--;	/* allow for trailing \0 */

	if (len < 3)

		return "???";

	for (i = 0 ; i < cookie->len ; i++) {

		if (len < 2) {

			strcpy(p-3, "...");

			break;

		}

		sprintf(p, "%02x", cookie->data[i]);

		p += 2;

		len -= 2;

	}

	*p = '\0';



	return buf;

}

#endif

fs/lockd/xdr.c

+0 −29
Original line number Diff line number Diff line
@@ -341,32 +341,3 @@ nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p, void *dummy) 
{

	return xdr_ressize_check(rqstp, p);

}
 


#ifdef RPC_DEBUG

const char *nlmdbg_cookie2a(const struct nlm_cookie *cookie)

{

	/*

	 * We can get away with a static buffer because we're only

	 * called with BKL held.

	 */

	static char buf[2*NLM_MAXCOOKIELEN+1];

	unsigned int i, len = sizeof(buf);

	char *p = buf;



	len--;	/* allow for trailing \0 */

	if (len < 3)

		return "???";

	for (i = 0 ; i < cookie->len ; i++) {

		if (len < 2) {

			strcpy(p-3, "...");

			break;

		}

		sprintf(p, "%02x", cookie->data[i]);

		p += 2;

		len -= 2;

	}

	*p = '\0';



	return buf;

}

#endif

include/linux/lockd/debug.h

+0 −10
Original line number Diff line number Diff line
@@ -44,14 +44,4 @@ 
#define NLMDBG_XDR		0x0100

#define NLMDBG_ALL		0x7fff





/*

 * Support for printing NLM cookies in dprintk()

 */

#ifdef RPC_DEBUG

struct nlm_cookie;

/* Call this function with the BKL held (it uses a static buffer) */

extern const char *nlmdbg_cookie2a(const struct nlm_cookie *);

#endif



#endif /* LINUX_LOCKD_DEBUG_H */