diff options
author | imp <imp@FreeBSD.org> | 2016-04-14 05:10:41 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2016-04-14 05:10:41 +0000 |
commit | 19f97c184f0cadbfe6eaf32e2c3f2b84103ebe81 (patch) | |
tree | 771261487fac0e42311b4cbdb99207d4ce303902 /sys/geom | |
parent | 4c3365f0f1beadc7e200aafb69275318bb3ac1b6 (diff) | |
download | FreeBSD-src-19f97c184f0cadbfe6eaf32e2c3f2b84103ebe81.zip FreeBSD-src-19f97c184f0cadbfe6eaf32e2c3f2b84103ebe81.tar.gz |
Bump bio_cmd and bio_*flags from 8 bits to 16.
Differential Revision: https://reviews.freebsd.org/D5784
Diffstat (limited to 'sys/geom')
-rw-r--r-- | sys/geom/geom_io.c | 4 | ||||
-rw-r--r-- | sys/geom/geom_subr.c | 4 | ||||
-rw-r--r-- | sys/geom/mirror/g_mirror.c | 2 | ||||
-rw-r--r-- | sys/geom/raid3/g_raid3.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sys/geom/geom_io.c b/sys/geom/geom_io.c index 61f70c1..8270274 100644 --- a/sys/geom/geom_io.c +++ b/sys/geom/geom_io.c @@ -504,11 +504,11 @@ g_io_request(struct bio *bp, struct g_consumer *cp) cmd = bp->bio_cmd; if (cmd == BIO_READ || cmd == BIO_WRITE || cmd == BIO_GETATTR) { KASSERT(bp->bio_data != NULL, - ("NULL bp->data in g_io_request(cmd=%hhu)", bp->bio_cmd)); + ("NULL bp->data in g_io_request(cmd=%hu)", bp->bio_cmd)); } if (cmd == BIO_DELETE || cmd == BIO_FLUSH) { KASSERT(bp->bio_data == NULL, - ("non-NULL bp->data in g_io_request(cmd=%hhu)", + ("non-NULL bp->data in g_io_request(cmd=%hu)", bp->bio_cmd)); } if (cmd == BIO_READ || cmd == BIO_WRITE || cmd == BIO_DELETE) { diff --git a/sys/geom/geom_subr.c b/sys/geom/geom_subr.c index bf14a86..54a99bf 100644 --- a/sys/geom/geom_subr.c +++ b/sys/geom/geom_subr.c @@ -1508,8 +1508,8 @@ DB_SHOW_COMMAND(bio, db_show_bio) db_printf("BIO %p\n", bp); db_print_bio_cmd(bp); db_print_bio_flags(bp); - db_printf(" cflags: 0x%hhx\n", bp->bio_cflags); - db_printf(" pflags: 0x%hhx\n", bp->bio_pflags); + db_printf(" cflags: 0x%hx\n", bp->bio_cflags); + db_printf(" pflags: 0x%hx\n", bp->bio_pflags); db_printf(" offset: %jd\n", (intmax_t)bp->bio_offset); db_printf(" length: %jd\n", (intmax_t)bp->bio_length); db_printf(" bcount: %ld\n", bp->bio_bcount); diff --git a/sys/geom/mirror/g_mirror.c b/sys/geom/mirror/g_mirror.c index 70f5eb1..59da980 100644 --- a/sys/geom/mirror/g_mirror.c +++ b/sys/geom/mirror/g_mirror.c @@ -1905,7 +1905,7 @@ g_mirror_worker(void *arg) g_mirror_sync_request(bp); /* WRITE */ else { KASSERT(0, - ("Invalid request cflags=0x%hhx to=%s.", + ("Invalid request cflags=0x%hx to=%s.", bp->bio_cflags, bp->bio_to->name)); } } else { diff --git a/sys/geom/raid3/g_raid3.c b/sys/geom/raid3/g_raid3.c index 584076f..617f72e 100644 --- a/sys/geom/raid3/g_raid3.c +++ b/sys/geom/raid3/g_raid3.c @@ -2127,7 +2127,7 @@ process: g_raid3_sync_request(bp); /* WRITE */ else { KASSERT(0, - ("Invalid request cflags=0x%hhx to=%s.", + ("Invalid request cflags=0x%hx to=%s.", bp->bio_cflags, bp->bio_to->name)); } } else if (g_raid3_register_request(bp) != 0) { |