From b108953c6fdfe7973254745f152f00be321e31b8 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Thu, 31 Jan 2013 22:15:41 +0000 Subject: [PATCH] Remove leftover label after Giant removal from VFS. --- sys/kern/vfs_syscalls.c | 8 +++----- 1 file 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 @@ kern_openat(struct thread *td, int fd, char *path, enum uio_seg pathseg, */ 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 @@ kern_openat(struct thread *td, int fd, char *path, enum uio_seg pathseg, td->td_retval[0] = indx; return (0); bad: -bad_unlocked: KASSERT(indx == -1, ("indx=%d, should be -1", indx)); fdrop(fp, td); return (error);