diff options
| -rw-r--r-- | sys/dev/vinum/vinumio.c | 19 | ||||
| -rw-r--r-- | sys/dev/vinum/vinumioctl.c | 10 |
2 files changed, 0 insertions, 29 deletions
diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index 38500d8..735c84d 100644 --- a/sys/dev/vinum/vinumio.c +++ b/sys/dev/vinum/vinumio.c @@ -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, diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c index a9d7074..3eac631 100644 --- a/sys/dev/vinum/vinumioctl.c +++ b/sys/dev/vinum/vinumioctl.c @@ -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 */ } |
