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

Rearrange DIOCWDINFO a little; closer to wd.c.

This commit is contained in:
mycroft 1995-03-23 11:43:09 +00:00
parent 562ca7760b
commit 4712cd33dc
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/scsipi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.59 1995/03/23 11:37:51 mycroft Exp $ */
/* $NetBSD: cd.c,v 1.60 1995/03/23 11:43:09 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -611,9 +611,8 @@ cdioctl(dev, cmd, addr, flag, p)
error = setdisklabel(&cd->sc_dk.dk_label,
(struct disklabel *)addr, /*cd->sc_dk.dk_openmask : */0,
&cd->sc_dk.dk_cpulabel);
if (error == 0 && cmd == DIOCWDINFO)
error = writedisklabel(CDLABELDEV(dev), cdstrategy,
&cd->sc_dk.dk_label, &cd->sc_dk.dk_cpulabel);
if (error == 0) {
}
cd->flags &= ~CDF_LABELLING;
cdunlock(cd);

11
sys/dev/scsipi/sd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sd.c,v 1.61 1995/03/23 11:33:25 mycroft Exp $ */
/* $NetBSD: sd.c,v 1.62 1995/03/23 11:43:13 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -617,9 +617,12 @@ sdioctl(dev, cmd, addr, flag, p)
error = setdisklabel(&sd->sc_dk.dk_label,
(struct disklabel *)addr, /*sd->sc_dk.dk_openmask : */0,
&sd->sc_dk.dk_cpulabel);
if (error == 0 && cmd == DIOCWDINFO)
error = writedisklabel(SDLABELDEV(dev), sdstrategy,
&sd->sc_dk.dk_label, &sd->sc_dk.dk_cpulabel);
if (error == 0) {
if (cmd == DIOCWDINFO)
error = writedisklabel(SDLABELDEV(dev),
sdstrategy, &sd->sc_dk.dk_label,
&sd->sc_dk.dk_cpulabel);
}
sd->flags &= ~SDF_LABELLING;
sdunlock(sd);

7
sys/scsi/cd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cd.c,v 1.59 1995/03/23 11:37:51 mycroft Exp $ */
/* $NetBSD: cd.c,v 1.60 1995/03/23 11:43:09 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -611,9 +611,8 @@ cdioctl(dev, cmd, addr, flag, p)
error = setdisklabel(&cd->sc_dk.dk_label,
(struct disklabel *)addr, /*cd->sc_dk.dk_openmask : */0,
&cd->sc_dk.dk_cpulabel);
if (error == 0 && cmd == DIOCWDINFO)
error = writedisklabel(CDLABELDEV(dev), cdstrategy,
&cd->sc_dk.dk_label, &cd->sc_dk.dk_cpulabel);
if (error == 0) {
}
cd->flags &= ~CDF_LABELLING;
cdunlock(cd);

11
sys/scsi/sd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sd.c,v 1.61 1995/03/23 11:33:25 mycroft Exp $ */
/* $NetBSD: sd.c,v 1.62 1995/03/23 11:43:13 mycroft Exp $ */
/*
* Copyright (c) 1994, 1995 Charles Hannum. All rights reserved.
@ -617,9 +617,12 @@ sdioctl(dev, cmd, addr, flag, p)
error = setdisklabel(&sd->sc_dk.dk_label,
(struct disklabel *)addr, /*sd->sc_dk.dk_openmask : */0,
&sd->sc_dk.dk_cpulabel);
if (error == 0 && cmd == DIOCWDINFO)
error = writedisklabel(SDLABELDEV(dev), sdstrategy,
&sd->sc_dk.dk_label, &sd->sc_dk.dk_cpulabel);
if (error == 0) {
if (cmd == DIOCWDINFO)
error = writedisklabel(SDLABELDEV(dev),
sdstrategy, &sd->sc_dk.dk_label,
&sd->sc_dk.dk_cpulabel);
}
sd->flags &= ~SDF_LABELLING;
sdunlock(sd);