diff options
| author | matt <matt@NetBSD.org> | 2007-04-25 12:53:46 +0000 |
|---|---|---|
| committer | matt <matt@NetBSD.org> | 2007-04-25 12:53:46 +0000 |
| commit | bb1c05a804064ddf58e9a855cf09daf4dadcc73a (patch) | |
| tree | 06265f9de711c5a39da56e0e9e27651fcf72691b | |
| parent | f4aafa30844678aab3a13f670b6fc2c54bb0acb6 (diff) | |
Make this compile again if COMPAT_ULTRIX is enabled.
| -rw-r--r-- | sys/arch/vax/vax/disksubr.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/arch/vax/vax/disksubr.c b/sys/arch/vax/vax/disksubr.c index decbd634f70..a03f8cca516 100644 --- a/sys/arch/vax/vax/disksubr.c +++ b/sys/arch/vax/vax/disksubr.c @@ -1,4 +1,4 @@ -/* $NetBSD: disksubr.c,v 1.42 2007/03/04 19:21:55 christos Exp $ */ +/* $NetBSD: disksubr.c,v 1.43 2007/04/25 12:53:46 matt Exp $ */ /* * Copyright (c) 1982, 1986, 1988 Regents of the University of California. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.42 2007/03/04 19:21:55 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.43 2007/04/25 12:53:46 matt Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.42 2007/03/04 19:21:55 christos Exp $ #include <ufs/ufs/dinode.h> /* XXX for fs.h */ #include <ufs/ffs/fs.h> /* XXX for BBSIZE & SBSIZE */ -char *compat_label(dev_t dev, void (*strat)(struct buf *bp), +static const char *compat_label(dev_t dev, void (*strat)(struct buf *bp), struct disklabel *lp, struct cpu_disklabel *osdep); #endif /* COMPAT_ULTRIX */ @@ -129,7 +129,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), * Given a buffer bp, try and interpret it as an Ultrix disk label, * putting the partition info into a native NetBSD label */ -char * +const char * compat_label(dev, strat, lp, osdep) dev_t dev; void (*strat)(struct buf *bp); @@ -138,7 +138,8 @@ compat_label(dev, strat, lp, osdep) { dec_disklabel *dlp; struct buf *bp = NULL; - char *msg = NULL; + const char *msg = NULL; + uint8_t *dp = bp->b_data; bp = geteblk((int)lp->d_secsize); bp->b_dev = dev; @@ -153,8 +154,8 @@ compat_label(dev, strat, lp, osdep) goto done; } - for (dlp = (dec_disklabel *)bp->b_data; - dlp <= (dec_disklabel *)(bp->b_data+DEV_BSIZE-sizeof(*dlp)); + for (dlp = (dec_disklabel *)dp; + dlp <= (dec_disklabel *)(dp+DEV_BSIZE-sizeof(*dlp)); dlp = (dec_disklabel *)((char *)dlp + sizeof(long))) { int part; @@ -172,7 +173,7 @@ compat_label(dev, strat, lp, osdep) lp->d_interleave = 1; lp->d_flags = 0; lp->d_bbsize = BBSIZE; - lp->d_sbsize = SBSIZE; + lp->d_sbsize = 8192; for (part = 0; part <((MAXPARTITIONS<DEC_NUM_DISK_PARTS) ? MAXPARTITIONS : DEC_NUM_DISK_PARTS); |
