From owner-p4-projects@FreeBSD.ORG  Sat Jul  9 22:31:58 2005
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 6B14216A420; Sat,  9 Jul 2005 22:31:58 +0000 (GMT)
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 4525816A41C
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 22:31:58 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1756143D48
	for <perforce@freebsd.org>; Sat,  9 Jul 2005 22:31:58 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j69MVvva098548
	for <perforce@freebsd.org>; Sat, 9 Jul 2005 22:31:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j69MVvmb098545
	for perforce@freebsd.org; Sat, 9 Jul 2005 22:31:57 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Sat, 9 Jul 2005 22:31:57 GMT
Message-Id: <200507092231.j69MVvmb098545@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79870 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: Sat, 09 Jul 2005 22:31:59 -0000

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

Change 79870 by rwatson@rwatson_zoo on 2005/07/09 22:31:42

	Clean up file flag return handling, which has changed as of the
	last integration.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#13 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/sys_generic.c#13 (text+ko) ====

@@ -592,7 +592,7 @@
 		    fp->f_flag & ~FNONBLOCK);
 		if (error) {
 			FILE_UNLOCK(fp);
-			break;
+			goto out;
 		}
 #endif
 		if ((tmp = *(int *)data))
@@ -609,7 +609,7 @@
 		    fp->f_flag & ~FASYNC);
 		if (error) {
 			FILE_UNLOCK(fp);
-			break;
+			goto out;
 		}
 #endif
 		if ((tmp = *(int *)data))
@@ -625,6 +625,7 @@
 	if (error == 0 && (com & IOC_OUT))
 		error = copyout(data, uap->data, (u_int)size);
 
+out:
 	if (memp != NULL)
 		free(memp, M_IOCTLOPS);
 	fdrop(fp, td);