kernel/vinum: Use %jx in a number of places instead of %llx.
authorSascha Wildner <saw@online.de>
Fri, 20 Jun 2014 09:30:57 +0000 (11:30 +0200)
committerSascha Wildner <saw@online.de>
Fri, 20 Jun 2014 09:31:22 +0000 (11:31 +0200)
sys/dev/raid/vinum/vinuminterrupt.c
sys/dev/raid/vinum/vinumrequest.c
sys/dev/raid/vinum/vinumrevive.c

index 504b1de..1303f23 100644 (file)
@@ -414,12 +414,12 @@ complete_raid5_write(struct rqelement *rqe)
 #if VINUMDEBUG
                    if (debug & DEBUG_ADDRESSES)
                        log(LOG_DEBUG,
-                           "  %s dev %s, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n",
+                           "  %s dev %s, sd %d, offset 0x%jx, devoffset 0x%jx, length %d\n",
                            (rqe->b.b_cmd == BUF_CMD_READ) ? "Read" : "Write",
                            drive->devicename,
                            rqe->sdno,
-                           rqe->b.b_bio1.bio_offset - ((off_t)SD[rqe->sdno].driveoffset << DEV_BSHIFT),
-                           rqe->b.b_bio1.bio_offset,
+                           (uintmax_t)(rqe->b.b_bio1.bio_offset - ((off_t)SD[rqe->sdno].driveoffset << DEV_BSHIFT)),
+                           (uintmax_t)rqe->b.b_bio1.bio_offset,
                            rqe->b.b_bcount);
                    if (debug & DEBUG_LASTREQS)
                        logrq(loginfo_raid5_data, (union rqinfou) rqe, ubio);
@@ -451,12 +451,12 @@ complete_raid5_write(struct rqelement *rqe)
 #if VINUMDEBUG
     if (debug & DEBUG_ADDRESSES)
        log(LOG_DEBUG,
-           "  %s dev %s, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n",
+           "  %s dev %s, sd %d, offset 0x%jx, devoffset 0x%jx, length %d\n",
            (rqe->b.b_cmd == BUF_CMD_READ) ? "Read" : "Write",
            drive->devicename,
            rqe->sdno,
-           rqe->b.b_bio1.bio_offset - ((off_t)SD[rqe->sdno].driveoffset << DEV_BSHIFT),
-           rqe->b.b_bio1.bio_offset,
+           (uintmax_t)(rqe->b.b_bio1.bio_offset - ((off_t)SD[rqe->sdno].driveoffset << DEV_BSHIFT)),
+           (uintmax_t)rqe->b.b_bio1.bio_offset,
            rqe->b.b_bcount);
     if (debug & DEBUG_LASTREQS)
        logrq(loginfo_raid5_parity, (union rqinfou) rqe, ubio);
index 83231d6..44b56d3 100644 (file)
@@ -341,13 +341,13 @@ launch_requests(struct request *rq, int reviveok)
 #if VINUMDEBUG
        if (debug & DEBUG_REVIVECONFLICT) {
            log(LOG_DEBUG,
-               "Revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %d\n",
+               "Revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%jx, length %d\n",
                rq->sdno,
                rq,
                (rq->bio->bio_buf->b_cmd & BUF_CMD_READ) ? "Read" : "Write",
                major(((cdev_t)rq->bio->bio_driver_info)),
                minor(((cdev_t)rq->bio->bio_driver_info)),
-               rq->bio->bio_offset,
+               (uintmax_t)rq->bio->bio_offset,
                rq->bio->bio_buf->b_bcount);
        }
 #endif
@@ -357,12 +357,12 @@ launch_requests(struct request *rq, int reviveok)
 #if VINUMDEBUG
     if (debug & DEBUG_ADDRESSES)
        log(LOG_DEBUG,
-           "Request: %p\n%s dev %d.%d, offset 0x%llx, length %d\n",
+           "Request: %p\n%s dev %d.%d, offset 0x%jx, length %d\n",
            rq,
            (rq->bio->bio_buf->b_cmd == BUF_CMD_READ) ? "Read" : "Write",
            major(((cdev_t)rq->bio->bio_driver_info)),
            minor(((cdev_t)rq->bio->bio_driver_info)),
-           rq->bio->bio_offset,
+           (uintmax_t)rq->bio->bio_offset,
            rq->bio->bio_buf->b_bcount);
     vinum_conf.lastrq = rq;
     vinum_conf.lastbio = rq->bio;
@@ -420,13 +420,13 @@ launch_requests(struct request *rq, int reviveok)
 #ifdef VINUMDEBUG
                if (debug & DEBUG_ADDRESSES)
                    log(LOG_DEBUG,
-                       "  %s dev %d.%d, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n",
+                       "  %s dev %d.%d, sd %d, offset 0x%jx, devoffset 0x%jx, length %d\n",
                        (rqe->b.b_cmd == BUF_CMD_READ) ? "Read" : "Write",
                        major(dev),
                        minor(dev),
                        rqe->sdno,
-                       rqe->b.b_bio1.bio_offset - ((off_t)SD[rqe->sdno].driveoffset << DEV_BSHIFT),
-                       rqe->b.b_bio1.bio_offset,
+                       (uintmax_t)(rqe->b.b_bio1.bio_offset - ((off_t)SD[rqe->sdno].driveoffset << DEV_BSHIFT)),
+                       (uintmax_t)rqe->b.b_bio1.bio_offset,
                        rqe->b.b_bcount);
                if (debug & DEBUG_LASTREQS)
                    logrq(loginfo_rqe, (union rqinfou) rqe, rq->bio);
@@ -964,12 +964,12 @@ sdio(struct bio *bio)
 #if VINUMDEBUG
     if (debug & DEBUG_ADDRESSES)
        log(LOG_DEBUG,
-           "  %s dev %s, sd %d, offset 0x%llx, devoffset 0x%llx, length %d\n",
+           "  %s dev %s, sd %d, offset 0x%jx, devoffset 0x%jx, length %d\n",
            (sbp->b.b_cmd == BUF_CMD_READ) ? "Read" : "Write",
            drive->devicename,
            sbp->sdno,
-           sbp->b.b_bio1.bio_offset - ((off_t)SD[sbp->sdno].driveoffset << DEV_BSHIFT),
-           sbp->b.b_bio1.bio_offset,
+           (uintmax_t)(sbp->b.b_bio1.bio_offset - ((off_t)SD[sbp->sdno].driveoffset << DEV_BSHIFT)),
+           (uintmax_t)sbp->b.b_bio1.bio_offset,
            sbp->b.b_bcount);
 #endif
     crit_enter();
index a2ab8cf..1391544 100644 (file)
@@ -204,13 +204,13 @@ revive_block(int sdno)
            if (debug & DEBUG_REVIVECONFLICT) {
                dev = rq->bio->bio_driver_info;
                log(LOG_DEBUG,
-                   "Relaunch revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%llx, length %d\n",
+                   "Relaunch revive conflict sd %d: %p\n%s dev %d.%d, offset 0x%jx, length %d\n",
                    rq->sdno,
                    rq,
                    (rq->bio->bio_buf->b_cmd == BUF_CMD_READ) ? "Read" : "Write",
                    major(dev),
                    minor(dev),
-                   rq->bio->bio_offset,
+                   (uintmax_t)rq->bio->bio_offset,
                    rq->bio->bio_buf->b_bcount);
            }
 #endif