diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-26 01:06:40 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2008-01-30 02:06:12 -0500 |
commit | 3fbd67ad61f6d5a09ea717b56c50bc5c3d8042a8 (patch) | |
tree | ffac0a032211517e9d0bc9ff21a09f8c21fdf1c3 /fs/nfs/client.c | |
parent | 57bfa89171e50cddf51a4f62c90e47c6259857b4 (diff) |
NFSv4: Iterate through all nfs_clients when the server recalls a delegation
The same delegation may have been handed out to more than one nfs_client.
Ensure that if a recall occurs, we return all instances.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/client.c')
-rw-r--r-- | fs/nfs/client.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 7a15832369e9..685c43f810c1 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c | |||
@@ -276,6 +276,41 @@ struct nfs_client *nfs_find_client(const struct sockaddr *addr, u32 nfsversion) | |||
276 | } | 276 | } |
277 | 277 | ||
278 | /* | 278 | /* |
279 | * Find a client by IP address and protocol version | ||
280 | * - returns NULL if no such client | ||
281 | */ | ||
282 | struct nfs_client *nfs_find_client_next(struct nfs_client *clp) | ||
283 | { | ||
284 | struct sockaddr *sap = (struct sockaddr *)&clp->cl_addr; | ||
285 | u32 nfsvers = clp->rpc_ops->version; | ||
286 | |||
287 | spin_lock(&nfs_client_lock); | ||
288 | list_for_each_entry_continue(clp, &nfs_client_list, cl_share_link) { | ||
289 | struct sockaddr *clap = (struct sockaddr *)&clp->cl_addr; | ||
290 | |||
291 | /* Don't match clients that failed to initialise properly */ | ||
292 | if (clp->cl_cons_state != NFS_CS_READY) | ||
293 | continue; | ||
294 | |||
295 | /* Different NFS versions cannot share the same nfs_client */ | ||
296 | if (clp->rpc_ops->version != nfsvers) | ||
297 | continue; | ||
298 | |||
299 | if (sap->sa_family != clap->sa_family) | ||
300 | continue; | ||
301 | /* Match only the IP address, not the port number */ | ||
302 | if (!nfs_sockaddr_match_ipaddr(sap, clap)) | ||
303 | continue; | ||
304 | |||
305 | atomic_inc(&clp->cl_count); | ||
306 | spin_unlock(&nfs_client_lock); | ||
307 | return clp; | ||
308 | } | ||
309 | spin_unlock(&nfs_client_lock); | ||
310 | return NULL; | ||
311 | } | ||
312 | |||
313 | /* | ||
279 | * Find an nfs_client on the list that matches the initialisation data | 314 | * Find an nfs_client on the list that matches the initialisation data |
280 | * that is supplied. | 315 | * that is supplied. |
281 | */ | 316 | */ |