diff options
author | NeilBrown <neilb@suse.de> | 2006-10-04 05:15:45 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 10:55:15 -0400 |
commit | 5680c44632053a6c9464bca43083f01776d318da (patch) | |
tree | 220f7bcb0168972bbc2ce804074f42b5470a1e15 /net | |
parent | cda9e0cd8a6b30ccc32edced066c378fbd87003d (diff) |
[PATCH] knfsd: Fixed handling of lockd fail when adding nfsd socket
Arrgg.. We cannot 'lockd_up' before 'svc_addsock' as we don't know the
protocol yet.... So switch it around again and save the name of the created
sockets so that it can be closed if lock_up fails.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/svcsock.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 4e0813b12ccf..4de8626e4f54 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
@@ -492,6 +492,9 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose) | |||
492 | } | 492 | } |
493 | spin_unlock(&serv->sv_lock); | 493 | spin_unlock(&serv->sv_lock); |
494 | if (closesk) | 494 | if (closesk) |
495 | /* Should unregister with portmap, but you cannot | ||
496 | * unregister just one protocol... | ||
497 | */ | ||
495 | svc_delete_socket(closesk); | 498 | svc_delete_socket(closesk); |
496 | else if (toclose) | 499 | else if (toclose) |
497 | return -ENOENT; | 500 | return -ENOENT; |