2 files changed, 5 insertions, 4 deletions

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 2cef0a68aa77..0cac49bc0955 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -34,7 +34,8 @@ struct nfs_client {
         nfs4_verifier           cl_confirm;
         unsigned long           cl_state;
 
-        u32                     cl_lockowner_id;
+        struct rb_root          cl_openowner_id;
+        struct rb_root          cl_lockowner_id;
 
         /*
          * The following rwsem ensures exclusive access to the server
@@ -43,7 +44,7 @@ struct nfs_client {
         struct rw_semaphore     cl_sem;
 
         struct list_head        cl_delegations;
-        struct list_head        cl_state_owners;
+        struct rb_root          cl_state_owners;
         spinlock_t              cl_lock;
 
         unsigned long           cl_lease_time;
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index f7100df3a690..38d77681cf27 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -119,7 +119,7 @@ struct nfs_openargs {
         struct nfs_seqid *      seqid;
         int                     open_flags;
         __u64                   clientid;
-        __u32                   id;
+        __u64                   id;
         union {
                 struct iattr *  attrs;    /* UNCHECKED, GUARDED */
                 nfs4_verifier   verifier; /* EXCLUSIVE */
@@ -181,7 +181,7 @@ struct nfs_closeres {
  *   */
 struct nfs_lowner {
         __u64                   clientid;
-        u32                     id;
+        __u64                   id;
 };
 
 struct nfs_lock_args {