From owner-p4-projects@FreeBSD.ORG  Tue Oct 25 21:37:24 2011
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F09DA1065673; Tue, 25 Oct 2011 21:37:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3790106566C
	for <perforce@freebsd.org>; Tue, 25 Oct 2011 21:37:23 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
	[IPv6:2001:4f8:fff6::2d])
	by mx1.freebsd.org (Postfix) with ESMTP id A18CF8FC13
	for <perforce@freebsd.org>; Tue, 25 Oct 2011 21:37:23 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
	by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id p9PLbNus018924
	for <perforce@freebsd.org>; Tue, 25 Oct 2011 21:37:23 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id p9PLbN19018921
	for perforce@freebsd.org; Tue, 25 Oct 2011 21:37:23 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 25 Oct 2011 21:37:23 GMT
Message-Id: <201110252137.p9PLbN19018921@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
Cc: 
Subject: PERFORCE change 200718 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 25 Oct 2011 21:37:24 -0000

http://p4web.freebsd.org/@@200718?ac=10

Change 200718 by jhb@jhb_jhbbsd on 2011/10/25 21:36:42

	Move devfs_fpdrop() into devfs_close_f() since it only
	applies to DTYPE_DEV devices.  This makes it possible to
	reuse f_cdevpriv for other file types for something else.

Affected files ...

.. //depot/projects/fadvise/sys/fs/devfs/devfs_vnops.c#2 edit
.. //depot/projects/fadvise/sys/kern/kern_descrip.c#3 edit

Differences ...

==== //depot/projects/fadvise/sys/fs/devfs/devfs_vnops.c#2 (text+ko) ====

@@ -604,6 +604,13 @@
 	td->td_fpop = fp;
 	error = vnops.fo_close(fp, td);
 	td->td_fpop = fpop;
+
+	/*
+	 * The f_cdevpriv cannot be assigned non-NULL value while we
+	 * are destroying the file.
+	 */
+	if (fp->f_cdevpriv != NULL)
+		devfs_fpdrop(fp);
 	return (error);
 }
 

==== //depot/projects/fadvise/sys/kern/kern_descrip.c#3 (text+ko) ====

@@ -2576,12 +2576,6 @@
 		panic("fdrop: count %d", fp->f_count);
 	if (fp->f_ops != &badfileops)
 		error = fo_close(fp, td);
-	/*
-	 * The f_cdevpriv cannot be assigned non-NULL value while we
-	 * are destroying the file.
-	 */
-	if (fp->f_cdevpriv != NULL)
-		devfs_fpdrop(fp);
 	atomic_subtract_int(&openfiles, 1);
 	crfree(fp->f_cred);
 	uma_zfree(file_zone, fp);