4 files changed, 8 insertions, 8 deletions

diff --git a/include/linux/lockd/bind.h b/include/linux/lockd/bind.h
index aa50d89eac..246de1d84a 100644
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
@@ -23,7 +23,7 @@ struct svc_rqst;
  * This is the set of functions for lockd->nfsd communication
  */
 struct nlmsvc_binding {
-        u32                     (*fopen)(struct svc_rqst *,
+        __be32                  (*fopen)(struct svc_rqst *,
                                                 struct nfs_fh *,
                                                 struct file **);
         void                    (*fclose)(struct file *);
diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h
index 8c39654549..ac25b5649c 100644
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
@@ -191,7 +191,7 @@ __be32		  nlmsvc_cancel_blocked(struct nlm_file *, struct nlm_lock *);
 unsigned long     nlmsvc_retry_blocked(void);
 void              nlmsvc_traverse_blocks(struct nlm_host *, struct nlm_file *,
                                         nlm_host_match_fn_t match);
-void              nlmsvc_grant_reply(struct nlm_cookie *, u32);
+void              nlmsvc_grant_reply(struct nlm_cookie *, __be32);
 
 /*
  * File handling for the server personality
@@ -206,7 +206,7 @@ void		  nlmsvc_invalidate_all(void);
 static __inline__ struct inode *
 nlmsvc_file_inode(struct nlm_file *file)
 {
-        return file->f_file->f_dentry->d_inode;
+        return file->f_file->f_path.dentry->d_inode;
 }
 
 /*
diff --git a/include/linux/lockd/sm_inter.h b/include/linux/lockd/sm_inter.h
index fc61d40964..22a645828f 100644
--- a/include/linux/lockd/sm_inter.h
+++ b/include/linux/lockd/sm_inter.h
@@ -24,7 +24,7 @@
  * Arguments for all calls to statd
  */
 struct nsm_args {
-        u32             addr;           /* remote address */
+        __be32          addr;           /* remote address */
         u32             prog;           /* RPC callback info */
         u32             vers;
         u32             proc;
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 29e7d9fc9d..83a1f9f623 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -69,7 +69,7 @@ typedef struct nlm_args nlm_args;
  */
 struct nlm_res {
         struct nlm_cookie       cookie;
-        u32                     status;
+        __be32                  status;
         struct nlm_lock         lock;
 };
 
@@ -80,9 +80,9 @@ struct nlm_reboot {
         char *          mon;
         int             len;
         u32             state;
-        u32             addr;
-        u32             vers;
-        u32             proto;
+        __be32          addr;
+        __be32          vers;
+        __be32          proto;
 };
 
 /*