diff options
author | NeilBrown <neilb@suse.de> | 2023-06-03 07:14:14 +1000 |
---|---|---|
committer | Chuck Lever <chuck.lever@oracle.com> | 2023-06-12 12:16:34 -0400 |
commit | 665e89ab7c5af1f2d260834c861a74b01a30f95f (patch) | |
tree | 5b4eaca073d5f5b31d7b557de8d7b992638802b8 /fs/lockd | |
parent | 518f375c15af724cd89a4ec888dea942bb27f77f (diff) | |
download | linux-665e89ab7c5af1f2d260834c861a74b01a30f95f.tar.gz linux-665e89ab7c5af1f2d260834c861a74b01a30f95f.tar.bz2 linux-665e89ab7c5af1f2d260834c861a74b01a30f95f.zip |
lockd: drop inappropriate svc_get() from locked_get()
The below-mentioned patch was intended to simplify refcounting on the
svc_serv used by locked. The goal was to only ever have a single
reference from the single thread. To that end we dropped a call to
lockd_start_svc() (except when creating thread) which would take a
reference, and dropped the svc_put(serv) that would drop that reference.
Unfortunately we didn't also remove the svc_get() from
lockd_create_svc() in the case where the svc_serv already existed.
So after the patch:
- on the first call the svc_serv was allocated and the one reference
was given to the thread, so there are no extra references
- on subsequent calls svc_get() was called so there is now an extra
reference.
This is clearly not consistent.
The inconsistency is also clear in the current code in lockd_get()
takes *two* references, one on nlmsvc_serv and one by incrementing
nlmsvc_users. This clearly does not match lockd_put().
So: drop that svc_get() from lockd_get() (which used to be in
lockd_create_svc().
Reported-by: Ido Schimmel <idosch@idosch.org>
Closes: https://lore.kernel.org/linux-nfs/ZHsI%2FH16VX9kJQX1@shredder/T/#u
Fixes: b73a2972041b ("lockd: move lockd_start_svc() call into lockd_create_svc()")
Signed-off-by: NeilBrown <neilb@suse.de>
Tested-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/lockd')
-rw-r--r-- | fs/lockd/svc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 04ba95b83d16..22d3ff3818f5 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -355,7 +355,6 @@ static int lockd_get(void) int error; if (nlmsvc_serv) { - svc_get(nlmsvc_serv); nlmsvc_users++; return 0; } |