Date: Tue, 16 Aug 2011 14:23:16 +0000 (UTC) From: Jonathan Anderson <jonathan@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r224911 - head/sys/fs/nfsserver Message-ID: <201108161423.p7GENGo8061242@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108161423.p7GENGo8061242>