diff options
| author | bde <bde@FreeBSD.org> | 1998-07-20 13:51:11 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1998-07-20 13:51:11 +0000 |
| commit | f1f93d27036568ac93065ac15dd66cf4eba5f2af (patch) | |
| tree | b0c5aab2e7d4494be258ce88df0fdf903198d205 /sys/kern/subr_diskslice.c | |
| parent | 79b1340c5bd1addb9d5b7a030c618f7c862d359b (diff) | |
| download | FreeBSD-src-f1f93d27036568ac93065ac15dd66cf4eba5f2af.zip FreeBSD-src-f1f93d27036568ac93065ac15dd66cf4eba5f2af.tar.gz | |
Cleaned up rev.1.39 - the shadowing variable should have just gone away.
Diffstat (limited to 'sys/kern/subr_diskslice.c')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index a0e09cf..29b7655 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.49 1998/07/20 12:37:59 bde Exp $ + * $Id: subr_diskslice.c,v 1.50 1998/07/20 13:39:44 bde Exp $ */ #include "opt_devfs.h" @@ -412,12 +412,10 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom) return (EINVAL); if (!*(int *)data) for (slice = 0; slice < ssp->dss_nslices; slice++) { - u_char openmask1; - - openmask1 = ssp->dss_slices[slice].ds_openmask; - if (openmask1 + openmask = ssp->dss_slices[slice].ds_openmask; + if (openmask && (slice != WHOLE_DISK_SLICE - || openmask1 & ~(1 << RAW_PART))) + || openmask & ~(1 << RAW_PART))) return (EBUSY); } |
