fix lossage from disklabel.h merge
This commit is contained in:
parent
961429e30c
commit
72812fcdca
@ -1,4 +1,4 @@
|
|||||||
/* $NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:25 ad Exp $ */
|
/* $NetBSD: disksubr.c,v 1.21 2013/05/13 15:40:31 christos Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
|
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
|
||||||
@ -32,7 +32,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/cdefs.h>
|
#include <sys/cdefs.h>
|
||||||
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.20 2008/01/02 11:48:25 ad Exp $");
|
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.21 2013/05/13 15:40:31 christos Exp $");
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
#include <sys/systm.h>
|
#include <sys/systm.h>
|
||||||
@ -165,7 +165,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
|
|||||||
cyl = LABELSECTOR / lp->d_secpercyl;
|
cyl = LABELSECTOR / lp->d_secpercyl;
|
||||||
if (!osdep)
|
if (!osdep)
|
||||||
goto nombrpart;
|
goto nombrpart;
|
||||||
dp = osdep->dosparts;
|
dp = osdep->mbrparts;
|
||||||
|
|
||||||
/* read master boot record */
|
/* read master boot record */
|
||||||
bp->b_blkno = MBR_BBSECTOR;
|
bp->b_blkno = MBR_BBSECTOR;
|
||||||
@ -386,7 +386,7 @@ writedisklabel(dev_t dev, void (*strat)(struct buf *), struct disklabel *lp,
|
|||||||
cyl = LABELSECTOR / lp->d_secpercyl;
|
cyl = LABELSECTOR / lp->d_secpercyl;
|
||||||
if (!osdep)
|
if (!osdep)
|
||||||
goto nombrpart;
|
goto nombrpart;
|
||||||
dp = osdep->dosparts;
|
dp = osdep->mbrparts;
|
||||||
|
|
||||||
/* read master boot record */
|
/* read master boot record */
|
||||||
bp->b_blkno = MBR_BBSECTOR;
|
bp->b_blkno = MBR_BBSECTOR;
|
||||||
|
Loading…
Reference in New Issue
Block a user