From cef3ec2fec473dbd48d2a9f2f946caabae607078 Mon Sep 17 00:00:00 2001 From: Vasily Averin Date: Wed, 1 Jun 2011 16:54:32 +0400 Subject: [PATCH] --- yaml --- r: 260833 b: refs/heads/master c: 82c2c8b8616fa9e77264c53f0df483f74ac54613 h: refs/heads/master i: 260831: aa0b60a0c3522c882a09216aae9f1011e1d31793 v: v3 --- [refs] | 2 +- trunk/fs/lockd/clntproc.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fe4cb7390ee8..6c7896d6ed85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 726fd6ad59f73bd116b6a22d701db078183673c8 +refs/heads/master: 82c2c8b8616fa9e77264c53f0df483f74ac54613 diff --git a/trunk/fs/lockd/clntproc.c b/trunk/fs/lockd/clntproc.c index e374050a911c..8392cb85bd54 100644 --- a/trunk/fs/lockd/clntproc.c +++ b/trunk/fs/lockd/clntproc.c @@ -302,7 +302,8 @@ nlmclnt_call(struct rpc_cred *cred, struct nlm_rqst *req, u32 proc) /* We appear to be out of the grace period */ wake_up_all(&host->h_gracewait); } - dprintk("lockd: server returns status %d\n", resp->status); + dprintk("lockd: server returns status %d\n", + ntohl(resp->status)); return 0; /* Okay, call complete */ } @@ -690,7 +691,8 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl) goto out; if (resp->status != nlm_lck_denied_nolocks) - printk("lockd: unexpected unlock status: %d\n", resp->status); + printk("lockd: unexpected unlock status: %d\n", + ntohl(resp->status)); /* What to do now? I'm out of my depth... */ status = -ENOLCK; out: @@ -843,6 +845,7 @@ nlm_stat_to_errno(__be32 status) return -ENOLCK; #endif } - printk(KERN_NOTICE "lockd: unexpected server status %d\n", status); + printk(KERN_NOTICE "lockd: unexpected server status %d\n", + ntohl(status)); return -ENOLCK; }