diff options
| author | sobomax <sobomax@FreeBSD.org> | 2016-04-23 06:31:46 +0000 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2016-04-23 06:31:46 +0000 |
| commit | 577d7115d64ea2b414c8ea52cc5c956b38c3f93f (patch) | |
| tree | f5534622e06202d6ba913ae3bd7c696b2fc7d0bb /sys/geom | |
| parent | c9088983bea1398b3f1f4dc684b0a6077bdd48cb (diff) | |
| download | FreeBSD-src-577d7115d64ea2b414c8ea52cc5c956b38c3f93f.zip FreeBSD-src-577d7115d64ea2b414c8ea52cc5c956b38c3f93f.tar.gz | |
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.
Diffstat (limited to 'sys/geom')
| -rw-r--r-- | sys/geom/uzip/g_uzip.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/geom/uzip/g_uzip.c b/sys/geom/uzip/g_uzip.c index 3660a92..97388fa 100644 --- a/sys/geom/uzip/g_uzip.c +++ b/sys/geom/uzip/g_uzip.c @@ -102,10 +102,9 @@ SYSCTL_UINT(_kern_geom_uzip, OID_AUTO, debug_block, CTLFLAG_RWTUN, 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 bio *bp) 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); |
