From owner-svn-src-head@FreeBSD.ORG  Thu Jan 31 22:15:42 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 8890BFD4;
 Thu, 31 Jan 2013 22:15:42 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 64D4573A;
 Thu, 31 Jan 2013 22:15:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0VMFgV5047664;
 Thu, 31 Jan 2013 22:15:42 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0VMFgb6047663;
 Thu, 31 Jan 2013 22:15:42 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201301312215.r0VMFgb6047663@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 31 Jan 2013 22:15:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246172 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 31 Jan 2013 22:15:42 -0000

Author: pjd
Date: Thu Jan 31 22:15:41 2013
New Revision: 246172
URL: http://svnweb.freebsd.org/changeset/base/246172

Log:
  Remove leftover label after Giant removal from VFS.

Modified:
  head/sys/kern/vfs_syscalls.c

Modified: head/sys/kern/vfs_syscalls.c
==============================================================================
--- head/sys/kern/vfs_syscalls.c	Thu Jan 31 22:14:16 2013	(r246171)
+++ head/sys/kern/vfs_syscalls.c	Thu Jan 31 22:15:41 2013	(r246172)
@@ -1108,7 +1108,7 @@ kern_openat(struct thread *td, int fd, c
 
 		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);