diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-07-20 20:10:22 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-07-23 14:51:26 +0200 |
| commit | ac77efbe2b4d2a1e571a4f1e5b6e47de72a7d737 (patch) | |
| tree | 2ebb9f5178a3b81e357f95966f1e2eb0269e8e35 /fs/nfsd/nfsctl.c | |
| parent | nfsd: clean up nfsd_create_serv error handling (diff) | |
| download | linux-ac77efbe2b4d2a1e571a4f1e5b6e47de72a7d737.tar.xz linux-ac77efbe2b4d2a1e571a4f1e5b6e47de72a7d737.zip | |
nfsd: just keep single lockd reference for nfsd
Right now, nfsd keeps a lockd reference for each socket that it has
open. This is unnecessary and complicates the error handling on
startup and shutdown. Change it to just do a lockd_up when starting
the first nfsd thread just do a single lockd_down when taking down the
last nfsd thread. Because of the strange way the sv_count is handled
this requires an extra flag to tell whether the nfsd_serv holds a
reference for lockd or not.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd/nfsctl.c')
| -rw-r--r-- | fs/nfsd/nfsctl.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index 9e8645a07fca..b1c5be85bea5 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c @@ -949,15 +949,8 @@ static ssize_t __write_ports_addfd(char *buf) if (err != 0) return err; - err = lockd_up(); - if (err != 0) { - svc_destroy(nfsd_serv); - return err; - } - err = svc_addsock(nfsd_serv, fd, buf, SIMPLE_TRANSACTION_LIMIT); if (err < 0) { - lockd_down(); svc_destroy(nfsd_serv); return err; } @@ -982,9 +975,6 @@ static ssize_t __write_ports_delfd(char *buf) if (nfsd_serv != NULL) len = svc_sock_names(nfsd_serv, buf, SIMPLE_TRANSACTION_LIMIT, toclose); - if (len >= 0) - lockd_down(); - kfree(toclose); return len; } |