2 files changed, 10 insertions, 7 deletions

diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index e374050a911..8392cb85bd5 100644
--- 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;
 }
diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
index 6e31695d046..f0179c3745d 100644
--- a/fs/lockd/svclock.c
+++ b/fs/lockd/svclock.c
@@ -632,7 +632,7 @@ nlmsvc_cancel_blocked(struct nlm_file *file, struct nlm_lock *lock)
 
 /*
  * This is a callback from the filesystem for VFS file lock requests.
- * It will be used if fl_grant is defined and the filesystem can not
+ * It will be used if lm_grant is defined and the filesystem can not
  * respond to the request immediately.
  * For GETLK request it will copy the reply to the nlm_block.
  * For SETLK or SETLKW request it will get the local posix lock.
@@ -719,9 +719,9 @@ static int nlmsvc_same_owner(struct file_lock *fl1, struct file_lock *fl2)
 }
 
 const struct lock_manager_operations nlmsvc_lock_operations = {
-        .fl_compare_owner = nlmsvc_same_owner,
-        .fl_notify = nlmsvc_notify_blocked,
-        .fl_grant = nlmsvc_grant_deferred,
+        .lm_compare_owner = nlmsvc_same_owner,
+        .lm_notify = nlmsvc_notify_blocked,
+        .lm_grant = nlmsvc_grant_deferred,
 };
 
 /*