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

geli: Move check for DEVT_DISK into geli_probe_and_attach

Browse Source 
We only work on DEVT_DISK disks, so move that into the probe to drive
the point home better.

Sponsored by:		Netflix
This commit is contained in:
Warner Losh 2022-10-21 18:16:56 -06:00
parent 0080f30ff1
commit bb3230e40b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stand/common/devopen.c
View File

@ -63,9 +63,7 @@ devopen(struct open_file *f, const char *fname, const char **file)
* pw if needed), this will attach the geli code to the open_file by
* replacing f->f_dev and f_devdata with pointers to a geli_devdesc.
*/
if (f->f_dev->dv_type == DEVT_DISK) {
geli_probe_and_attach(f);
}
geli_probe_and_attach(f);
#endif
return (0);

3
stand/libsa/geli/gelidev.c
View File

@ -301,6 +301,9 @@ geli_probe_and_attach(struct open_file *f)
hdesc = (struct disk_devdesc *)(f->f_devdata);
/* We only work on DEVT_DISKs */
if (hdesc->dd.d_dev->dv_type != DEVT_DISK)
return;
/* Get the last block number for the host provider. */
if (hdesc->dd.d_dev->dv_ioctl(f, DIOCGMEDIASIZE, &hmediasize) != 0)
return;