diff options
| author | jonathan <jonathan@FreeBSD.org> | 2011-08-16 14:23:16 +0000 |
|---|---|---|
| committer | jonathan <jonathan@FreeBSD.org> | 2011-08-16 14:23:16 +0000 |
| commit | a5a39a26b2ea8ab4d283505d58396a5e76d38c7a (patch) | |
| tree | c5b4eb78910da2a749af07f720999cf6a904da8d | |
| parent | a76ca2eae754746b1de94206ff7de76a42bc6bab (diff) | |
| download | FreeBSD-src-a5a39a26b2ea8ab4d283505d58396a5e76d38c7a.zip FreeBSD-src-a5a39a26b2ea8ab4d283505d58396a5e76d38c7a.tar.gz | |
Fix a merge conflict.
r224086 added "goto out"-style error handling to nfssvc_nfsd(), in order
to reliably call NFSEXITCODE() before returning. Our Capsicum changes,
based on the old "return (error)" model, did not merge nicely.
Approved by: re (kib), mentor (rwatson)
Sponsored by: Google Inc
| -rw-r--r-- | sys/fs/nfsserver/nfs_nfsdport.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index da32b0e..82f05d0 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -3036,7 +3036,6 @@ nfssvc_nfsd(struct thread *td, struct nfssvc_args *uap) */ if ((error = fget(td, sockarg.sock, CAP_SOCK_ALL, &fp)) != 0) goto out; - return (error); if (fp->f_type != DTYPE_SOCKET) { fdrop(fp, td); error = EPERM; |
