Author: sobomax
Date: Sat Apr 23 06:31:46 2016
New Revision: 298502
URL: https://svnweb.freebsd.org/changeset/base/298502
Log:
o Fix handling of images with compression block sizes comparable to
MAXPHYS.
o Improve debug somewhat;
o Convert "BUG BUG BUG message" into a proper KASSERT.
Modified:
head/sys/geom/uzip/g_uzip.c
Modified: head/sys/geom/uzip/g_uzip.c
==============================================================================
--- head/sys/geom/uzip/g_uzip.c Sat Apr 23 04:27:01 2016 (r298501)
+++ head/sys/geom/uzip/g_uzip.c Sat Apr 23 06:31:46 2016 (r298502)
@@ -102,10 +102,9 @@ SYSCTL_UINT(_kern_geom_uzip, OID_AUTO, d
printf a; \
}
#define DPRINTF_BRNG(lvl, bcn, ecn, a) \
- if (bcn >= ecn) { \
- printf("DPRINTF_BRNG: invalid range (%ju, %ju), BUG BUG " \
- "BUG!\n", (uintmax_t)bcn, (uintmax_t)ecn); \
- } else if (((lvl) <= g_uzip_debug) || \
+ KASSERT(bcn < ecn, ("DPRINTF_BRNG: invalid range (%ju, %ju)", \
+ (uintmax_t)bcn, (uintmax_t)ecn)); \
+ if (((lvl) <= g_uzip_debug) || \
BLK_IN_RANGE(g_uzip_debug_block, bcn, \
(intmax_t)ecn - (intmax_t)bcn)) { \
printf a; \
@@ -274,10 +273,15 @@ g_uzip_request(struct g_geom *gp, struct
bp2->bio_length = TLEN_2_BLEN(sc, pp, bp2, end_blk - 1);
if (bp2->bio_length <= MAXPHYS)
break;
-
+ if (end_blk == (start_blk + 1)) {
+ break;
+ }
end_blk--;
}
+ DPRINTF(GUZ_DBG_IO, ("%s/%s: bp2->bio_length = %jd\n",
+ __func__, gp->name, (intmax_t)bp2->bio_length));
+
bp2->bio_data = malloc(bp2->bio_length, M_GEOM_UZIP, M_NOWAIT);
if (bp2->bio_data == NULL) {
g_destroy_bio(bp2);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
