From owner-p4-projects@FreeBSD.ORG  Tue Jun 27 00:49:43 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3FE0C16A404; Tue, 27 Jun 2006 00:49:43 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id F266816A400
	for <perforce@freebsd.org>; Tue, 27 Jun 2006 00:49:42 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 27BE243D96
	for <perforce@freebsd.org>; Tue, 27 Jun 2006 00:49:32 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k5R0nWJ9060104
	for <perforce@freebsd.org>; Tue, 27 Jun 2006 00:49:32 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k5R0nWp5060101
	for perforce@freebsd.org; Tue, 27 Jun 2006 00:49:32 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 27 Jun 2006 00:49:32 GMT
Message-Id: <200606270049.k5R0nWp5060101@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 100107 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Jun 2006 00:49:43 -0000

http://perforce.freebsd.org/chv.cgi?CH=100107

Change 100107 by kmacy@kmacy_storage:sun4v_work_sleepq on 2006/06/27 00:48:36

	move out error checking out of the lock held path in _fget

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#9 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/kern/kern_descrip.c#9 (text+ko) ====

@@ -1965,30 +1965,35 @@
 	if (td == NULL || (fdp = td->td_proc->p_fd) == NULL)
 		return (EBADF);
 	FILEDESC_LOCK(fdp);
-	if ((fp = fget_locked(fdp, fd)) == NULL || fp->f_ops == &badfileops) {
+	if ((fp = fget_locked(fdp, fd)) == NULL) {
+		hold = 0;
+		goto fail;
+	}
+	if (hold) {
+		fhold(fp);
 		FILEDESC_UNLOCK(fdp);
-		return (EBADF);
 	}
-
+	*fpp = fp;
+	if (fp->f_ops == &badfileops) 
+		goto fail;
 	/*
 	 * FREAD and FWRITE failure return EBADF as per POSIX.
 	 *
 	 * Only one flag, or 0, may be specified.
 	 */
-	if (flags == FREAD && (fp->f_flag & FREAD) == 0) {
+	if (flags == FREAD && (fp->f_flag & FREAD) == 0) 
+		goto fail;
+	if (flags == FWRITE && (fp->f_flag & FWRITE) == 0) 
+		goto fail;
+	return (0);
+ fail:
+	if (hold) {
+		FILEDESC_LOCK(fdp);
+		fdrop(fp, curthread);
 		FILEDESC_UNLOCK(fdp);
-		return (EBADF);
-	}
-	if (flags == FWRITE && (fp->f_flag & FWRITE) == 0) {
+	} else
 		FILEDESC_UNLOCK(fdp);
-		return (EBADF);
-	}
-	if (hold) {
-		fhold(fp);
-		FILEDESC_UNLOCK(fdp);
-	}
-	*fpp = fp;
-	return (0);
+	return (EBADF);
 }
 
 int