diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2009-10-08 18:05:22 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2010-01-13 15:39:14 -0500 |
| commit | e0ad421dabad027c33f78268d4829643b19165fd (patch) | |
| tree | aff0fcbd8d5b84fb85afcd974636a36c1949f927 /utils/mountd | |
| parent | 250c232f53bce01ffd0696f7a55b1e2b0feca51a (diff) | |
| download | nfs-utils-e0ad421dabad027c33f78268d4829643b19165fd.tar.gz nfs-utils-e0ad421dabad027c33f78268d4829643b19165fd.tar.xz nfs-utils-e0ad421dabad027c33f78268d4829643b19165fd.zip | |
mountd: mountlist_del_all cleanup
Common exit code.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Diffstat (limited to 'utils/mountd')
| -rw-r--r-- | utils/mountd/rmtab.c | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c index c371f8d..b028529 100644 --- a/utils/mountd/rmtab.c +++ b/utils/mountd/rmtab.c @@ -143,23 +143,16 @@ mountlist_del_all(struct sockaddr_in *sin) return; if (!(hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET))) { xlog(L_ERROR, "can't get hostname of %s", inet_ntoa(addr)); - xfunlock(lockid); - return; + goto out_unlock; } - else - hp = hostent_dup (hp); + hp = hostent_dup (hp); + + if (!setrmtabent("r")) + goto out_free; + + if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) + goto out_close; - if (!setrmtabent("r")) { - xfunlock(lockid); - free (hp); - return; - } - if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) { - endrmtabent(); - xfunlock(lockid); - free (hp); - return; - } while ((rep = getrmtabent(1, NULL)) != NULL) { if (strcmp(rep->r_client, hp->h_name) == 0 && (exp = auth_authenticate("umountall", sin, rep->r_path))) @@ -170,10 +163,13 @@ mountlist_del_all(struct sockaddr_in *sin) xlog(L_ERROR, "couldn't rename %s to %s", _PATH_RMTABTMP, _PATH_RMTAB); } - endrmtabent(); /* close & unlink */ fendrmtabent(fp); - xfunlock(lockid); +out_close: + endrmtabent(); /* close & unlink */ +out_free: free (hp); +out_unlock: + xfunlock(lockid); } mountlist |