summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-10-20 20:50:31 +0000
committerphk <phk@FreeBSD.org>2002-10-20 20:50:31 +0000
commitd9cf8d547889228b79c739f549eaa1d96e78856e (patch)
treef78000e9dcb29d87c2677cce5ec328a6a1c2da1c
parent6c70e7ba980490dd092e728144518733eed32383 (diff)
downloadFreeBSD-src-d9cf8d547889228b79c739f549eaa1d96e78856e.zip
FreeBSD-src-d9cf8d547889228b79c739f549eaa1d96e78856e.tar.gz
Use ENOSPC error return, not ENOMEM.
Use %jd rather than %lld.
-rw-r--r--sys/dev/md/md.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index e26ef4c..b1347ff 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -324,7 +324,7 @@ s_write(struct indir *ip, off_t offset, uintptr_t ptr)
cip->array[idx] =
(uintptr_t)new_indir(cip->shift - nshift);
if (cip->array[idx] == 0)
- return (ENOMEM);
+ return (ENOSPC);
cip->used++;
up = cip->array[idx];
cip = (struct indir *)up;
@@ -543,9 +543,11 @@ mdstrategy(struct bio *bp)
struct md_s *sc;
if (md_debug > 1)
- printf("mdstrategy(%p) %s %x, %lld, %ld, %p)\n",
+ printf("mdstrategy(%p) %s %x, %jd, %jd %ld, %p)\n",
(void *)bp, devtoname(bp->bio_dev), bp->bio_flags,
- (long long)bp->bio_blkno, bp->bio_bcount / DEV_BSIZE,
+ (intmax_t)bp->bio_blkno,
+ (intmax_t)bp->bio_pblkno,
+ bp->bio_bcount / DEV_BSIZE,
(void *)bp->bio_data);
sc = bp->bio_dev->si_drv1;
OpenPOWER on IntegriCloud