diff options
| author | Chuck Lever | 2010-12-14 15:57:52 +0100 |
|---|---|---|
| committer | Trond Myklebust | 2010-12-16 18:37:24 +0100 |
| commit | d8367c504e39528a057a5d7a267b6724f7fdb4b8 (patch) | |
| tree | 1d5b9f76680334a93e05aa09b86e071fac2c7baa /fs/lockd/svclock.c | |
| parent | NFS: Repair whitespace damage in NFS PROC macro (diff) | |
| download | kernel-qcow2-linux-d8367c504e39528a057a5d7a267b6724f7fdb4b8.tar.gz kernel-qcow2-linux-d8367c504e39528a057a5d7a267b6724f7fdb4b8.tar.xz kernel-qcow2-linux-d8367c504e39528a057a5d7a267b6724f7fdb4b8.zip | |
lockd: Move nlmdbg_cookie2a() to svclock.c
Clean up. nlmdbg_cookie2a() is used only in svclock.c.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Tested-by: J. Bruce Fields <bfields@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/lockd/svclock.c')
| -rw-r--r-- | fs/lockd/svclock.c | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c index ef5659b211e9..9266c4600208 100644 --- a/fs/lockd/svclock.c +++ b/fs/lockd/svclock.c @@ -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 |