Skip to content

Commit 665e89a

Browse files
neilbrownchucklever
authored andcommitted
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 <[email protected]> Closes: https://lore.kernel.org/linux-nfs/ZHsI%2FH16VX9kJQX1@shredder/T/#u Fixes: b73a297 ("lockd: move lockd_start_svc() call into lockd_create_svc()") Signed-off-by: NeilBrown <[email protected]> Tested-by: Ido Schimmel <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent 518f375 commit 665e89a

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

fs/lockd/svc.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,6 @@ static int lockd_get(void)
355355
int error;
356356

357357
if (nlmsvc_serv) {
358-
svc_get(nlmsvc_serv);
359358
nlmsvc_users++;
360359
return 0;
361360
}

0 commit comments

Comments
 (0)