Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of disklabel indirection functions.

Browse Source
This commit is contained in:
mycroft 1994-01-11 16:35:44 +00:00
parent 24621baf6a
commit 4448a68e2c
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/arch/i386/i386/disksubr.c
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
* $Id: disksubr.c,v 1.2 1993/05/22 07:59:47 cgd Exp $
* $Id: disksubr.c,v 1.3 1994/01/11 16:35:44 mycroft Exp $
*/
#include "param.h"
@ -41,7 +41,7 @@
#include "disklabel.h"
#include "syslog.h"
/* encoding of disk minor numbers, should be elsewhere... */
/* XXX encoding of disk minor numbers, should be elsewhere... */
#define dkunit(dev) (minor(dev) >> 3)
#define dkpart(dev) (minor(dev) & 7)
#define dkminor(unit, part) (((unit) << 3) | (part))
@ -64,7 +64,7 @@
* Returns null on success and an error string on failure.
*/
char *
cpu_readdisklabel(dev, strat, lp, osdep)
readdisklabel(dev, strat, lp, osdep)
dev_t dev;
int (*strat)();
register struct disklabel *lp;
@ -214,7 +214,7 @@ done:
* Check new disk label for sensibility
* before setting it.
*/
cpu_setdisklabel(olp, nlp, openmask, osdep)
setdisklabel(olp, nlp, openmask, osdep)
register struct disklabel *olp, *nlp;
u_long openmask;
struct cpu_disklabel *osdep;
@ -270,9 +270,9 @@ cpu_setdisklabel(olp, nlp, openmask, osdep)
/*
* Write disk label back to device after modification.
*/
cpu_writedisklabel(dev, strat, lp, osdep)
writedisklabel(dev, strat, lp, osdep)
dev_t dev;
int (*strat)();
void (*strat)();
register struct disklabel *lp;
struct cpu_disklabel *osdep;
{

2
sys/kern/subr_disk.c
View File

@ -1 +1 @@
revision 1.5 intentionally removed
revision 1.6 intentionally removed

14
sys/sys/disklabel.h
View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* from: @(#)disklabel.h 7.19 (Berkeley) 5/7/91
* $Id: disklabel.h,v 1.11 1994/01/09 20:05:38 cgd Exp $
* $Id: disklabel.h,v 1.12 1994/01/11 16:37:19 mycroft Exp $
*/
#ifndef _SYS_DISKLABEL_H_
@ -367,17 +367,11 @@ int dkcksum __P((struct disklabel *));
int setdisklabel __P((struct disklabel *, struct disklabel *, u_long,
struct cpu_disklabel *));
int cpu_setdisklabel __P((struct disklabel *, struct disklabel *, u_long,
char *readdisklabel __P((int, void (*)(), struct disklabel *,
struct cpu_disklabel *));
char *readdisklabel __P((int, int (*)(), struct disklabel *,
struct cpu_disklabel *));
char *cpu_readdisklabel __P((int, int (*)(), struct disklabel *,
struct cpu_disklabel *));
int writedisklabel __P((int, int (*)(), struct disklabel *,
struct cpu_disklabel *));
int cpu_writedisklabel __P((int, int (*)(), struct disklabel *,
int writedisklabel __P((int, void (*)(), struct disklabel *,
struct cpu_disklabel *));
#endif