vserver 1.9.5.x5

[linux-2.6.git] / fs / lockd / svclock.c

diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 80e7cc4..de3f50a 100644 (file)
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -112,11 +112,11 @@ nlmsvc_lookup_block(struct nlm_file *file, struct nlm_lock *lock, int remove)
                                (long long)lock->fl.fl_end, lock->fl.fl_type);
        for (head = &nlm_blocked; (block = *head) != 0; head = &block->b_next) {
                fl = &block->b_call.a_args.lock.fl;
-               dprintk("lockd: check f=%p pd=%d %Ld-%Ld ty=%d cookie=%x\n",
+               dprintk("lockd: check f=%p pd=%d %Ld-%Ld ty=%d cookie=%s\n",
                                block->b_file, fl->fl_pid,
                                (long long)fl->fl_start,
                                (long long)fl->fl_end, fl->fl_type,
-                               *(unsigned int*)(block->b_call.a_args.cookie.data));
+                               nlmdbg_cookie2a(&block->b_call.a_args.cookie));
                if (block->b_file == file && nlm_compare_locks(fl, &lock->fl)) {
                        if (remove) {
                                *head = block->b_next;
@@ -584,13 +584,13 @@ nlmsvc_grant_callback(struct rpc_task *task)
        struct sockaddr_in      *peer_addr = RPC_PEERADDR(task->tk_client);
 
        dprintk("lockd: GRANT_MSG RPC callback\n");
-       dprintk("callback: looking for cookie %x, host (%08x)\n", 
-               *(unsigned int *)(call->a_args.cookie.data),
-               ntohl(peer_addr->sin_addr.s_addr));
+       dprintk("callback: looking for cookie %s, host (%u.%u.%u.%u)\n",
+               nlmdbg_cookie2a(&call->a_args.cookie),
+               NIPQUAD(peer_addr->sin_addr.s_addr));
        if (!(block = nlmsvc_find_block(&call->a_args.cookie, peer_addr))) {
-               dprintk("lockd: no block for cookie %x, host (%08x)\n",
-                       *(u32 *)(call->a_args.cookie.data),
-                       ntohl(peer_addr->sin_addr.s_addr));
+               dprintk("lockd: no block for cookie %s, host (%u.%u.%u.%u)\n",
+                       nlmdbg_cookie2a(&call->a_args.cookie),
+                       NIPQUAD(peer_addr->sin_addr.s_addr));
                return;
        }