nfsd: Move the open owner hash table into struct nfs4_client

Preparation for removing the client_mutex.

Convert the open owner hash table into a per-client table and protect it
using the nfs4_client->cl_lock spin lock.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
index a71d144..e1f479c 100644 (file)
--- a/fs/nfsd/netns.h
+++ b/fs/nfsd/netns.h
@@ -63,7 +63,6 @@ struct nfsd_net {
        struct rb_root conf_name_tree;
        struct list_head *unconf_id_hashtbl;
        struct rb_root unconf_name_tree;
-       struct list_head *ownerstr_hashtbl;
        struct list_head *sessionid_hashtbl;
        /*
         * client_lru holds client queue ordered by nfs4_client.cl_time

diff --cc fs/nfsd/nfs4state.c
Simple merge

diff --cc fs/nfsd/state.h
Simple merge