diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-24 14:53:35 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-10-24 16:46:22 +0200 |
| commit | e498daa81295d02f7359af313c2b7f87e1062207 (patch) | |
| tree | 0136f271daecc366e6ad701fc275822e170f8dc9 /fs/lockd | |
| parent | LOCKD: fix races in nsm_client_get (diff) | |
| download | linux-e498daa81295d02f7359af313c2b7f87e1062207.tar.xz linux-e498daa81295d02f7359af313c2b7f87e1062207.zip | |
LOCKD: Clear ln->nsm_clnt only when ln->nsm_users is zero
The current code is clearing it in all cases _except_ when zero.
Reported-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: stable@vger.kernel.org
Diffstat (limited to 'fs/lockd')
| -rw-r--r-- | fs/lockd/mon.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/fs/lockd/mon.c b/fs/lockd/mon.c index fe695603e395..3d7e09bcc0e9 100644 --- a/fs/lockd/mon.c +++ b/fs/lockd/mon.c @@ -124,18 +124,16 @@ out: static void nsm_client_put(struct net *net) { struct lockd_net *ln = net_generic(net, lockd_net_id); - struct rpc_clnt *clnt = ln->nsm_clnt; - int shutdown = 0; + struct rpc_clnt *clnt = NULL; spin_lock(&ln->nsm_clnt_lock); - if (ln->nsm_users) { - if (--ln->nsm_users) - ln->nsm_clnt = NULL; - shutdown = !ln->nsm_users; + ln->nsm_users--; + if (ln->nsm_users == 0) { + clnt = ln->nsm_clnt; + ln->nsm_clnt = NULL; } spin_unlock(&ln->nsm_clnt_lock); - - if (shutdown) + if (clnt != NULL) rpc_shutdown_client(clnt); } |