Author: jonathan
Date: Tue Aug 16 14:23:16 2011
New Revision: 224911
URL: http://svn.freebsd.org/changeset/base/224911
Log:
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
Modified:
head/sys/fs/nfsserver/nfs_nfsdport.c
Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c Tue Aug 16 14:14:56 2011
(r224910)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c Tue Aug 16 14:23:16 2011
(r224911)
@@ -3036,7 +3036,6 @@ nfssvc_nfsd(struct thread *td, struct nf
*/
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;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
