1 files changed, 3 insertions, 5 deletions

diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 52b4378311c8..0cac49bc0955 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -16,7 +16,6 @@ struct nfs_client {
 #define NFS_CS_INITING          1               /* busy initialising */
         int                     cl_nfsversion;  /* NFS protocol version */
         unsigned long           cl_res_state;   /* NFS resources state */
-#define NFS_CS_RPCIOD           0               /* - rpciod started */
 #define NFS_CS_CALLBACK         1               /* - callback started */
 #define NFS_CS_IDMAP            2               /* - idmap started */
 #define NFS_CS_RENEWD           3               /* - renewd started */
@@ -35,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
@@ -44,9 +44,7 @@ struct nfs_client {
         struct rw_semaphore     cl_sem;
 
         struct list_head        cl_delegations;
-        struct list_head        cl_state_owners;
-        struct list_head        cl_unused;
-        int                     cl_nunused;
+        struct rb_root          cl_state_owners;
         spinlock_t              cl_lock;
 
         unsigned long           cl_lease_time;