From: NeilBrown 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" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- fs/nfsd/nfsctl.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff -puN fs/nfsd/nfsctl.c~knfsd-check-return-value-of-lockd_up-in-write_ports fs/nfsd/nfsctl.c --- a/fs/nfsd/nfsctl.c~knfsd-check-return-value-of-lockd_up-in-write_ports +++ a/fs/nfsd/nfsctl.c @@ -454,12 +454,15 @@ static ssize_t write_ports(struct file * err = nfsd_create_serv(); if (!err) { 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 * the service */ - if (err >= 0) - lockd_up(proto); nfsd_serv->sv_nrthreads--; } return err; _