From owner-svn-src-stable@FreeBSD.ORG  Sun Jan 18 21:52:02 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA1F81065675;
	Sun, 18 Jan 2009 21:52:02 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A811F8FC1D;
	Sun, 18 Jan 2009 21:52:02 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0ILq27H088299;
	Sun, 18 Jan 2009 21:52:02 GMT (envelope-from lulf@svn.freebsd.org)
Received: (from lulf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0ILq2B8088298;
	Sun, 18 Jan 2009 21:52:02 GMT (envelope-from lulf@svn.freebsd.org)
Message-Id: <200901182152.n0ILq2B8088298@svn.freebsd.org>
From: Ulf Lilleengen <lulf@FreeBSD.org>
Date: Sun, 18 Jan 2009 21:52:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187412 - in stable/7/sys: . contrib/pf dev/cxgb
	geom/vinum
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 18 Jan 2009 21:52:03 -0000

Author: lulf
Date: Sun Jan 18 21:52:01 2009
New Revision: 187412
URL: http://svn.freebsd.org/changeset/base/187412

Log:
  MFC r186517:
  
  - Fix an issue with access permissions to underlying disks used by a gvinum
    plex. If the plex is a raid5 plex, and is being written to, parity data might
    have to be read from the underlying disks, requiring them to be opened for
    reading as well as writing.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/geom/vinum/geom_vinum_plex.c

Modified: stable/7/sys/geom/vinum/geom_vinum_plex.c
==============================================================================
--- stable/7/sys/geom/vinum/geom_vinum_plex.c	Sun Jan 18 21:40:15 2009	(r187411)
+++ stable/7/sys/geom/vinum/geom_vinum_plex.c	Sun Jan 18 21:52:01 2009	(r187412)
@@ -667,11 +667,21 @@ gv_plex_normal_request(struct gv_plex *p
 static int
 gv_plex_access(struct g_provider *pp, int dr, int dw, int de)
 {
+	struct gv_plex *p;
 	struct g_geom *gp;
 	struct g_consumer *cp, *cp2;
 	int error;
 
 	gp = pp->geom;
+	p = gp->softc;
+	KASSERT(p != NULL, ("NULL p"));
+
+	if (p->org == GV_PLEX_RAID5) {
+		if (dw > 0 && dr == 0)
+			dr = 1;
+		else if (dw < 0 && dr == 0)
+			dr = -1;
+	}
 
 	LIST_FOREACH(cp, &gp->consumer, consumer) {
 		error = g_access(cp, dr, dw, de);