svn commit: r212878 - stable/7/sys/geom

Alexander Motin mav at FreeBSD.org
Sun Sep 19 19:57:16 UTC 2010


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;


More information about the svn-src-all mailing list