Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Teach zfs bdevsw to do b_psize." 

This is used only by dump and swap, which won't work safely on zvols
anyway.  We should make swap work eventually, but right now it's
leading unwary ussers into deadlock scenarios, so let's make it fail
early instead.
This commit is contained in:
riastradh 2023-09-10 12:50:38 +00:00
parent 81b5cd66ad
commit 023cbde14b
1 changed files with 1 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c vendored
View File

@ -7062,29 +7062,6 @@ nb_zvol_strategy(struct buf *bp)
(void) zvol_strategy(bp);
}
static int
nb_zvol_psize(dev_t dev)
{
minor_t minor = getminor(dev);
off_t nbytes;
unsigned bytespersector;
if (minor == 0) /* /dev/zfs */
return -1;
if (zvol_ioctl(dev, DIOCGMEDIASIZE, (intptr_t)&nbytes, 0,
NOCRED, NULL))
return -1;
if (zvol_ioctl(dev, DIOCGSECTORSIZE, (intptr_t)&bytespersector, 0,
NOCRED, NULL))
return -1;
if (bytespersector == 0) /* paranoia */
return -1;
if (nbytes/bytespersector > INT_MAX) /* paranoia */
return -1;
return nbytes/bytespersector;
}
static const struct fileops zfs_fileops = {
.fo_name = "zfs",
.fo_read = fbadop_read,
@ -7104,7 +7081,7 @@ const struct bdevsw zfs_bdevsw = {
.d_strategy = nb_zvol_strategy,
.d_ioctl = nb_zfsdev_ioctl,
.d_dump = nodump,
.d_psize = nb_zvol_psize,
.d_psize = nosize,
.d_flag = D_DISK | D_MPSAFE
};