Use %jd instead of %lld now that we have it.
This commit is contained in:
parent
9e2ebaa081
commit
14ac6812b9
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=105540
@ -36,6 +36,7 @@
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/stdint.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/malloc.h>
|
||||
#include <sys/kernel.h>
|
||||
@ -352,8 +353,8 @@ g_dev_done(struct bio *bp2)
|
||||
bp2, bp->bio_error);
|
||||
bp->bio_flags |= BIO_ERROR;
|
||||
} else {
|
||||
g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %lld",
|
||||
bp2, bp, bp->bio_resid, bp2->bio_completed);
|
||||
g_trace(G_T_BIO, "g_dev_done(%p/%p) resid %ld completed %jd",
|
||||
bp2, bp, bp->bio_resid, (intmax_t)bp2->bio_completed);
|
||||
}
|
||||
bp->bio_resid = bp->bio_bcount - bp2->bio_completed;
|
||||
g_destroy_bio(bp2);
|
||||
@ -378,9 +379,9 @@ g_dev_strategy(struct bio *bp)
|
||||
bp2->bio_length = (off_t)bp->bio_bcount;
|
||||
bp2->bio_done = g_dev_done;
|
||||
g_trace(G_T_BIO,
|
||||
"g_dev_strategy(%p/%p) offset %lld length %lld data %p cmd %d",
|
||||
bp, bp2, bp->bio_offset, bp2->bio_length, bp2->bio_data,
|
||||
bp2->bio_cmd);
|
||||
"g_dev_strategy(%p/%p) offset %jd length %jd data %p cmd %d",
|
||||
bp, bp2, (intmax_t)bp->bio_offset, (intmax_t)bp2->bio_length,
|
||||
bp2->bio_data, bp2->bio_cmd);
|
||||
g_io_request(bp2, cp);
|
||||
}
|
||||
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/stdint.h>
|
||||
#include <sys/sbuf.h>
|
||||
#ifndef _KERNEL
|
||||
#include <stdio.h>
|
||||
@ -143,6 +144,8 @@ g_conf_provider(struct sbuf *sb, struct g_provider *pp)
|
||||
sbuf_printf(sb, "\t <mode>r%dw%de%d</mode>\n",
|
||||
pp->acr, pp->acw, pp->ace);
|
||||
sbuf_printf(sb, "\t <name>%s</name>\n", pp->name);
|
||||
sbuf_printf(sb, "\t <mediasize>%jd</mediasize>\n",
|
||||
(intmax_t)pp->mediasize);
|
||||
if (pp->geom->dumpconf) {
|
||||
sbuf_printf(sb, "\t <config>\n");
|
||||
pp->geom->dumpconf(sb, "\t ", pp->geom, NULL, pp);
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/stdint.h>
|
||||
#ifndef _KERNEL
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@ -121,8 +122,8 @@ g_pc98_taste(struct g_class *mp, struct g_provider *pp, int flags)
|
||||
error = g_getattr("GEOM::mediasize", cp, &mediasize);
|
||||
if (error) {
|
||||
mediasize = 0;
|
||||
printf("g_error %d Mediasize is %lld bytes\n",
|
||||
error, (long long)mediasize);
|
||||
printf("g_error %d Mediasize is %jd bytes\n",
|
||||
error, (intmax_t)mediasize);
|
||||
}
|
||||
error = g_getattr("GEOM::fwsectors", cp, &fwsect);
|
||||
if (error || fwsect == 0) {
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/stdint.h>
|
||||
#ifndef _KERNEL
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
@ -210,19 +211,19 @@ g_slice_dumpconf(struct sbuf *sb, char *indent, struct g_geom *gp, struct g_cons
|
||||
|
||||
gsp = gp->softc;
|
||||
if (gp != NULL && (pp == NULL && cp == NULL)) {
|
||||
sbuf_printf(sb, "%s<frontstuff>%llu</frontstuff>\n",
|
||||
indent, (unsigned long long)gsp->frontstuff);
|
||||
sbuf_printf(sb, "%s<frontstuff>%ju</frontstuff>\n",
|
||||
indent, (intmax_t)gsp->frontstuff);
|
||||
}
|
||||
if (pp != NULL) {
|
||||
sbuf_printf(sb, "%s<index>%u</index>\n", indent, pp->index);
|
||||
sbuf_printf(sb, "%s<length>%llu</length>\n",
|
||||
indent, (unsigned long long)gsp->slices[pp->index].length);
|
||||
sbuf_printf(sb, "%s<seclength>%llu</seclength>\n", indent,
|
||||
(unsigned long long)gsp->slices[pp->index].length / 512);
|
||||
sbuf_printf(sb, "%s<offset>%llu</offset>\n", indent,
|
||||
(unsigned long long)gsp->slices[pp->index].offset);
|
||||
sbuf_printf(sb, "%s<secoffset>%llu</secoffset>\n", indent,
|
||||
(unsigned long long)gsp->slices[pp->index].offset / 512);
|
||||
sbuf_printf(sb, "%s<length>%ju</length>\n",
|
||||
indent, (uintmax_t)gsp->slices[pp->index].length);
|
||||
sbuf_printf(sb, "%s<seclength>%ju</seclength>\n", indent,
|
||||
(uintmax_t)gsp->slices[pp->index].length / 512);
|
||||
sbuf_printf(sb, "%s<offset>%ju</offset>\n", indent,
|
||||
(uintmax_t)gsp->slices[pp->index].offset);
|
||||
sbuf_printf(sb, "%s<secoffset>%ju</secoffset>\n", indent,
|
||||
(uintmax_t)gsp->slices[pp->index].offset / 512);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -37,6 +37,7 @@
|
||||
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/stdint.h>
|
||||
#ifndef _KERNEL
|
||||
#include <stdio.h>
|
||||
#include <unistd.h>
|
||||
@ -471,8 +472,8 @@ g_handleattr(struct bio *bp, char *attribute, void *val, int len)
|
||||
if (strcmp(bp->bio_attribute, attribute))
|
||||
return (0);
|
||||
if (bp->bio_length != len) {
|
||||
printf("bio_length %lld len %d -> EFAULT\n",
|
||||
(long long)bp->bio_length, len);
|
||||
printf("bio_length %jd len %d -> EFAULT\n",
|
||||
(intmax_t)bp->bio_length, len);
|
||||
error = EFAULT;
|
||||
} else {
|
||||
error = 0;
|
||||
|
Loading…
Reference in New Issue
Block a user