openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] knfsd: Check return value of lockd_up in write_ports 

We should be checking the return value of lockd_up when adding a new socket to
nfsd.  So move the lockd_up before the svc_addsock and check the return value.

The move is because lockd_down is easy, but there is no easy way to remove a
recently added socket.

Cc: "J. Bruce Fields" <bfields@fieldses.org>
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:
NeilBrown 2006-10-02 02:17:51 -07:00 committed by Linus Torvalds
parent 6fb2b47fa1
commit 3dfb421053
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fs/nfsd/nfsctl.c
View File

@ -454,12 +454,15 @@ 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 = svc_addsock(nfsd_serv, fd, buf, &proto); err = lockd_up(proto);
if (!err) {
err = svc_addsock(nfsd_serv, fd, buf, &proto);
if (err)
lockd_down();
}
/* Decrease the count, but don't shutdown the /* Decrease the count, but don't shutdown the
* the service * the service
*/ */
if (err >= 0)
lockd_up(proto);
nfsd_serv->sv_nrthreads--; nfsd_serv->sv_nrthreads--;
} }
return err; return err;