d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix DIOCGMEDIASIZE and DIOCGSECTORSIZE ioctls to work for all

Browse Source 
disk devices. This fixes the problem with these ioctls returning
EINVAL for plain slice devices with no disklabel on them.

The patch incorporates improvements and style fixes from BDE.

Reviewed by:	bde
Approved by:	obrien (mentor)
This commit is contained in:
kan 2002-07-23 14:30:27 +00:00
parent af83e99c43
commit 2eb7466905
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/kern/subr_diskslice.c
View File

@ -365,6 +365,12 @@ dsioctl(dev, cmd, data, flags, sspp)
lp = sp->ds_label;
switch (cmd) {
case DIOCGDINFO:
if (lp == NULL)
return (EINVAL);
*(struct disklabel *)data = *lp;
return (0);
case DIOCGDVIRGIN:
lp = (struct disklabel *)data;
if (ssp->dss_slices[WHOLE_DISK_SLICE].ds_label) {
@ -398,23 +404,17 @@ dsioctl(dev, cmd, data, flags, sspp)
lp->d_checksum = dkcksum(lp);
return (0);
case DIOCGDINFO:
case DIOCGMEDIASIZE:
if (lp == NULL)
return (EINVAL);
*(struct disklabel *)data = *lp;
*(off_t *)data = (off_t)sp->ds_size * ssp->dss_secsize;
else
*(off_t *)data =
(off_t)lp->d_partitions[dkpart(dev)].p_size *
lp->d_secsize;
return (0);
case DIOCGSECTORSIZE:
if (lp == NULL)
return (EINVAL);
*(u_int *)data = lp->d_secsize;
return (0);
case DIOCGMEDIASIZE:
if (lp == NULL)
return (EINVAL);
*(off_t *)data = (off_t)lp->d_partitions[dkpart(dev)].p_size *
lp->d_secsize;
*(u_int *)data = ssp->dss_secsize;
return (0);
case DIOCGSLICEINFO: