]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d6f7248) | patch
Fix a merge conflict.
authorJonathan Anderson <jonathan@FreeBSD.org>
Tue, 16 Aug 2011 14:23:16 +0000 (14:23 +0000)
committerJonathan Anderson <jonathan@FreeBSD.org>
Tue, 16 Aug 2011 14:23:16 +0000 (14:23 +0000)
commit985a88e2a69018c47f812c1ee9ef48519049ff31
treec5b4eb78910da2a749af07f720999cf6a904da8dtree | snapshot
parentd6f724898368f8a55757aa5d7d443f90f558c17acommit | diff
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
sys/fs/nfsserver/nfs_nfsdport.c diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.