diff options
| author | Stanislav Kinsbursky <skinsbursky@parallels.com> | 2012-04-20 18:19:18 +0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-04-27 14:09:59 -0400 |
| commit | 7aab449e5a2ebfa9c5116e87e16536bc4195e4de (patch) | |
| tree | c948a96ddd87c2ed708875c961c9e3577737ae08 /net/sunrpc/clnt.c | |
| parent | a4dff1bc492ee4a2184d384ae8b5bcab5859e150 (diff) | |
| download | linux-3.10-7aab449e5a2ebfa9c5116e87e16536bc4195e4de.tar.gz linux-3.10-7aab449e5a2ebfa9c5116e87e16536bc4195e4de.tar.bz2 linux-3.10-7aab449e5a2ebfa9c5116e87e16536bc4195e4de.zip | |
SUNRPC: skip clients with program without PipeFS entries
1) This is sane.
2) Otherwise there will be soft lockup:
do {
rpc_get_client_for_event (clnt->cl_dentry == NULL ==> choose)
__rpc_pipefs_event (clnt->cl_program->pipe_dir_name == NULL ==> return)
} while (1)
Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/clnt.c')
| -rw-r--r-- | net/sunrpc/clnt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index d10ebc4310f..8a19849ff34 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c @@ -184,8 +184,6 @@ static int __rpc_pipefs_event(struct rpc_clnt *clnt, unsigned long event, switch (event) { case RPC_PIPEFS_MOUNT: - if (clnt->cl_program->pipe_dir_name == NULL) - break; dentry = rpc_setup_pipedir_sb(sb, clnt, clnt->cl_program->pipe_dir_name); BUG_ON(dentry == NULL); @@ -215,6 +213,8 @@ static struct rpc_clnt *rpc_get_client_for_event(struct net *net, int event) spin_lock(&sn->rpc_client_lock); list_for_each_entry(clnt, &sn->all_clients, cl_clients) { + if (clnt->cl_program->pipe_dir_name == NULL) + break; if (((event == RPC_PIPEFS_MOUNT) && clnt->cl_dentry) || ((event == RPC_PIPEFS_UMOUNT) && !clnt->cl_dentry)) continue; |