mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
[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>
This commit is contained in:
parent
cda9e0cd8a
commit
5680c44632
2 changed files with 9 additions and 6 deletions
|
@ -523,11 +523,11 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
|
||||||
err = nfsd_create_serv();
|
err = nfsd_create_serv();
|
||||||
if (!err) {
|
if (!err) {
|
||||||
int proto = 0;
|
int proto = 0;
|
||||||
err = lockd_up(proto);
|
err = svc_addsock(nfsd_serv, fd, buf, &proto);
|
||||||
if (!err) {
|
if (err >= 0) {
|
||||||
err = svc_addsock(nfsd_serv, fd, buf, &proto);
|
err = lockd_up(proto);
|
||||||
if (err)
|
if (err < 0)
|
||||||
lockd_down();
|
svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf);
|
||||||
}
|
}
|
||||||
/* Decrease the count, but don't shutdown the
|
/* Decrease the count, but don't shutdown the
|
||||||
* the service
|
* the service
|
||||||
|
@ -536,7 +536,7 @@ static ssize_t write_ports(struct file *file, char *buf, size_t size)
|
||||||
nfsd_serv->sv_nrthreads--;
|
nfsd_serv->sv_nrthreads--;
|
||||||
unlock_kernel();
|
unlock_kernel();
|
||||||
}
|
}
|
||||||
return err;
|
return err < 0 ? err : 0;
|
||||||
}
|
}
|
||||||
if (buf[0] == '-') {
|
if (buf[0] == '-') {
|
||||||
char *toclose = kstrdup(buf+1, GFP_KERNEL);
|
char *toclose = kstrdup(buf+1, GFP_KERNEL);
|
||||||
|
|
|
@ -492,6 +492,9 @@ svc_sock_names(char *buf, struct svc_serv *serv, char *toclose)
|
||||||
}
|
}
|
||||||
spin_unlock(&serv->sv_lock);
|
spin_unlock(&serv->sv_lock);
|
||||||
if (closesk)
|
if (closesk)
|
||||||
|
/* Should unregister with portmap, but you cannot
|
||||||
|
* unregister just one protocol...
|
||||||
|
*/
|
||||||
svc_delete_socket(closesk);
|
svc_delete_socket(closesk);
|
||||||
else if (toclose)
|
else if (toclose)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
|
Loading…
Reference in a new issue