mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-18 10:35:55 +00:00
Code Issues Releases Activity

NO_GEOM cleanup: unifdef -UNO_GEOM

Browse Source
This commit is contained in:
Poul-Henning Kamp 2003-02-22 09:36:40 +00:00
parent d0083ea9ce
commit c3dbde2864
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=111248
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/dev/vinum/vinumio.c
View File

@ -549,9 +549,6 @@ daemon_save_config(void)
struct drive *drive; /* point to current drive info */
struct vinum_hdr *vhdr; /* and as header */
char *config; /* point to config data */
#ifdef NO_GEOM
int wlabel_on; /* to set writing label on/off */
#endif
/* don't save the configuration while we're still working on it */
if (vinum_conf.flags & VF_CONFIGURING)
@ -601,27 +598,11 @@ daemon_save_config(void)
sizeof(vhdr->label));
if ((drive->state != drive_unallocated)
&& (drive->state != drive_referenced)) { /* and it's a real drive */
#ifdef NO_GEOM
wlabel_on = 1; /* enable writing the label */
(void) (*devsw(drive->dev)->d_ioctl) (drive->dev, /* make the label writeable */
DIOCWLABEL,
(caddr_t) & wlabel_on,
FWRITE,
curthread);
#endif
error = write_drive(drive, (char *) vhdr, VINUMHEADERLEN, VINUM_LABEL_OFFSET);
if (error == 0)
error = write_drive(drive, config, MAXCONFIG, VINUM_CONFIG_OFFSET); /* first config copy */
if (error == 0)
error = write_drive(drive, config, MAXCONFIG, VINUM_CONFIG_OFFSET + MAXCONFIG); /* second copy */
#ifdef NO_GEOM
wlabel_on = 0; /* enable writing the label */
(void) (*devsw(drive->dev)->d_ioctl) (drive->dev, /* make the label non-writeable again */
DIOCWLABEL,
(caddr_t) & wlabel_on,
FWRITE,
curthread);
#endif
unlockdrive(drive);
if (error) {
log(LOG_ERR,

10
sys/dev/vinum/vinumioctl.c
View File

@ -402,16 +402,6 @@ vinumioctl(dev_t dev,
case DIOCSDINFO: /* set partition info */
return 0; /* not a titty */
#ifdef NO_GEOM
case DIOCWLABEL: /* set or reset label writeable */
if ((flag & FWRITE) == 0) /* not writeable? */
return EACCES; /* no, die */
if (*(int *) data != 0) /* set it? */
vol->flags |= VF_WLABEL; /* yes */
else
vol->flags &= ~VF_WLABEL; /* no, reset */
break;
#endif
default:
return ENOTTY; /* not my kind of ioctl */
}