From owner-svn-src-stable-7@FreeBSD.ORG  Sun Sep 19 19:57:16 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2427A106564A;
	Sun, 19 Sep 2010 19:57:16 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 12FC28FC0A;
	Sun, 19 Sep 2010 19:57:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8JJvFV4014129;
	Sun, 19 Sep 2010 19:57:15 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8JJvFNX014126;
	Sun, 19 Sep 2010 19:57:15 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201009191957.o8JJvFNX014126@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Sun, 19 Sep 2010 19:57:15 +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: r212878 - stable/7/sys/geom
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 19 Sep 2010 19:57:16 -0000

Author: mav
Date: Sun Sep 19 19:57:15 2010
New Revision: 212878
URL: http://svn.freebsd.org/changeset/base/212878

Log:
  MFC r174669:
  Don't limit BIO_DELETE requests to MAXPHYS, they perform no data
  transfers, so they are not subject to the VM system limitation.

Modified:
  stable/7/sys/geom/geom_dev.c
  stable/7/sys/geom/geom_io.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/geom/geom_dev.c
==============================================================================
--- stable/7/sys/geom/geom_dev.c	Sun Sep 19 19:53:41 2010	(r212877)
+++ stable/7/sys/geom/geom_dev.c	Sun Sep 19 19:57:15 2010	(r212878)
@@ -314,8 +314,7 @@ g_dev_ioctl(struct cdev *dev, u_long cmd
 		offset = ((off_t *)data)[0];
 		length = ((off_t *)data)[1];
 		if ((offset % cp->provider->sectorsize) != 0 ||
-		    (length % cp->provider->sectorsize) != 0 ||
-		     length <= 0 || length > MAXPHYS) {
+		    (length % cp->provider->sectorsize) != 0 || length <= 0) {
 			printf("%s: offset=%jd length=%jd\n", __func__, offset,
 			    length);
 			error = EINVAL;

Modified: stable/7/sys/geom/geom_io.c
==============================================================================
--- stable/7/sys/geom/geom_io.c	Sun Sep 19 19:53:41 2010	(r212877)
+++ stable/7/sys/geom/geom_io.c	Sun Sep 19 19:57:15 2010	(r212878)
@@ -661,9 +661,8 @@ g_delete_data(struct g_consumer *cp, off
 	struct bio *bp;
 	int error;
 
-	KASSERT(length > 0 && length >= cp->provider->sectorsize &&
-	    length <= MAXPHYS, ("g_delete_data(): invalid length %jd",
-	    (intmax_t)length));
+	KASSERT(length > 0 && length >= cp->provider->sectorsize,
+	    ("g_delete_data(): invalid length %jd", (intmax_t)length));
 
 	bp = g_alloc_bio();
 	bp->bio_cmd = BIO_DELETE;