summaryrefslogtreecommitdiff
path: root/sys/kern/vfs_syscalls.c
diff options
context:
space:
mode:
authorPawel Jakub Dawidek <pjd@FreeBSD.org>2013-01-31 22:15:41 +0000
committerPawel Jakub Dawidek <pjd@FreeBSD.org>2013-01-31 22:15:41 +0000
commitb108953c6fdfe7973254745f152f00be321e31b8 (patch)
treec0abc76a2c21b1321832cca449f495a094b8b01b /sys/kern/vfs_syscalls.c
parenta2c496ebb9ddf1090925c1f76c4a3036749f04fe (diff)
downloadsrc-test2-b108953c6fdfe7973254745f152f00be321e31b8.tar.gz
src-test2-b108953c6fdfe7973254745f152f00be321e31b8.zip
Notes
Diffstat (limited to 'sys/kern/vfs_syscalls.c')
-rw-r--r--sys/kern/vfs_syscalls.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 3f2e523265ef..9780d63181d9 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -1108,7 +1108,7 @@ kern_openat(struct thread *td, int fd, char *path, enum uio_seg pathseg,
if (error == ERESTART)
error = EINTR;
- goto bad_unlocked;
+ goto bad;
}
td->td_dupfd = 0;
NDFREE(&nd, NDF_ONLY_PNBUF);
@@ -1150,12 +1150,11 @@ success:
*/
if ((error = kern_capwrap(td, fp, nd.ni_baserights,
&indx)) != 0)
- goto bad_unlocked;
+ goto bad;
} else
#endif
if ((error = finstall(td, fp, &indx, flags)) != 0)
- goto bad_unlocked;
-
+ goto bad;
}
/*
@@ -1166,7 +1165,6 @@ success:
td->td_retval[0] = indx;
return (0);
bad:
-bad_unlocked:
KASSERT(indx == -1, ("indx=%d, should be -1", indx));
fdrop(fp, td);
return (error);