Date: Thu, 4 Jun 2009 21:01:40 GMT From: Edward Tomasz Napierala <trasz@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 163524 for review Message-ID: <200906042101.n54L1eNm045637@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906042101.n54L1eNm045637>