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

From: NeilBrown
Date: Fri Jul 28 2006 - 01:09:32 EST



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@xxxxxxxxxxxx>

Signed-off-by: Neil Brown <neilb@xxxxxxx>

### Diffstat output
./fs/nfsd/nfsctl.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)

diff .prev/fs/nfsd/nfsctl.c ./fs/nfsd/nfsctl.c
--- .prev/fs/nfsd/nfsctl.c 2006-07-28 11:34:33.000000000 +1000
+++ ./fs/nfsd/nfsctl.c 2006-07-28 12:07:35.000000000 +1000
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/