From owner-p4-projects@FreeBSD.ORG  Thu Jun  4 21:01:42 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0B87A1065676; Thu,  4 Jun 2009 21:01:41 +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 BD93F106568A
	for <perforce@freebsd.org>; Thu,  4 Jun 2009 21:01:40 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 941C58FC29
	for <perforce@freebsd.org>; Thu,  4 Jun 2009 21:01:40 +0000 (UTC)
	(envelope-from trasz@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n54L1emm045639
	for <perforce@freebsd.org>; Thu, 4 Jun 2009 21:01:40 GMT
	(envelope-from trasz@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n54L1eNm045637
	for perforce@freebsd.org; Thu, 4 Jun 2009 21:01:40 GMT
	(envelope-from trasz@freebsd.org)
Date: Thu, 4 Jun 2009 21:01:40 GMT
Message-Id: <200906042101.n54L1eNm045637@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	trasz@freebsd.org using -f
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 163524 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: Thu, 04 Jun 2009 21:01:43 -0000

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

Change 163524 by trasz@trasz_victim on 2009/06/04 21:00:56

	IFC.

Affected files ...

.. //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#4 integrate

Differences ...

==== //depot/projects/soc2009/trasz_limits/sbin/ifconfig/ifieee80211.c#2 (text+ko) ====

@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.78 2009/03/26 21:29:38 sam Exp $
+ * $FreeBSD: src/sbin/ifconfig/ifieee80211.c,v 1.79 2009/06/04 18:22:21 sam Exp $
  */
 
 /*-
@@ -2888,7 +2888,7 @@
 	case IEEE80211_ELEMID_TPCREQ:	return " TPCREQ";
 	case IEEE80211_ELEMID_TPCREP:	return " TPCREP";
 	case IEEE80211_ELEMID_SUPPCHAN:	return " SUPPCHAN";
-	case IEEE80211_ELEMID_CHANSWITCHANN:return " CSA";
+	case IEEE80211_ELEMID_CSA:	return " CSA";
 	case IEEE80211_ELEMID_MEASREQ:	return " MEASREQ";
 	case IEEE80211_ELEMID_MEASREP:	return " MEASREP";
 	case IEEE80211_ELEMID_QUIET:	return " QUIET";

==== //depot/projects/soc2009/trasz_limits/sys/kern/vfs_vnops.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.281 2009/06/04 16:18:07 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_vnops.c,v 1.282 2009/06/04 16:50:03 ps Exp $");
 
 #include "opt_mac.h"
 
@@ -594,8 +594,7 @@
 	    (error = vn_start_write(vp, &mp, V_WAIT | PCATCH)) != 0)
 		goto unlock;
  
-	if (vp->v_mount != NULL &&
-	    (vp->v_mount->mnt_kern_flag & MNTK_SHARED_WRITES) &&
+	if (mp != NULL && (mp->mnt_kern_flag & MNTK_SHARED_WRITES) &&
 	    (flags & FOF_OFFSET) != 0) {
 		lock_flags = LK_SHARED;
 	} else {