Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[~andy/linux] / fs / lockd / clntproc.c

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index e374050a911c6141342bf5b464bb04fca396ce3e..8392cb85bd54401d27028f0ed2932dceb4dd98bf 100644 (file)
--- a/fs/lockd/clntproc.c
+++ b/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;
 }