diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-02 12:49:23 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-07-10 23:40:38 -0400 |
commit | 7af654f8d1b7460415af5d1d326233478dd0f563 (patch) | |
tree | 00ebad16a49f13aa99b518f2554de5dcbeafa79c /fs/nfs/client.c | |
parent | 27b3f949b769a208e2849d28e7ad64cadac5d0e3 (diff) |
NFSv4: Don't reuse expired nfs4_state_owner structs
That just confuses certain NFSv4 servers.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r-- | fs/nfs/client.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 71d4c4cdac52..6b424407d631 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
@@ -131,7 +131,6 @@ static struct nfs_client *nfs_alloc_client(const char *hostname, | |||
131 | init_rwsem(&clp->cl_sem); | 131 | init_rwsem(&clp->cl_sem); |
132 | INIT_LIST_HEAD(&clp->cl_delegations); | 132 | INIT_LIST_HEAD(&clp->cl_delegations); |
133 | INIT_LIST_HEAD(&clp->cl_state_owners); | 133 | INIT_LIST_HEAD(&clp->cl_state_owners); |
134 | INIT_LIST_HEAD(&clp->cl_unused); | ||
135 | spin_lock_init(&clp->cl_lock); | 134 | spin_lock_init(&clp->cl_lock); |
136 | INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state); | 135 | INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state); |
137 | rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client"); | 136 | rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client"); |
@@ -155,15 +154,6 @@ static void nfs4_shutdown_client(struct nfs_client *clp) | |||
155 | #ifdef CONFIG_NFS_V4 | 154 | #ifdef CONFIG_NFS_V4 |
156 | if (__test_and_clear_bit(NFS_CS_RENEWD, &clp->cl_res_state)) | 155 | if (__test_and_clear_bit(NFS_CS_RENEWD, &clp->cl_res_state)) |
157 | nfs4_kill_renewd(clp); | 156 | nfs4_kill_renewd(clp); |
158 | while (!list_empty(&clp->cl_unused)) { | ||
159 | struct nfs4_state_owner *sp; | ||
160 | |||
161 | sp = list_entry(clp->cl_unused.next, | ||
162 | struct nfs4_state_owner, | ||
163 | so_list); | ||
164 | list_del(&sp->so_list); | ||
165 | kfree(sp); | ||
166 | } | ||
167 | BUG_ON(!list_empty(&clp->cl_state_owners)); | 157 | BUG_ON(!list_empty(&clp->cl_state_owners)); |
168 | if (__test_and_clear_bit(NFS_CS_IDMAP, &clp->cl_res_state)) | 158 | if (__test_and_clear_bit(NFS_CS_IDMAP, &clp->cl_res_state)) |
169 | nfs_idmap_delete(clp); | 159 | nfs_idmap_delete(clp); |