Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: Ignore make_dev_s() errors 

Since errors returned by zvol_create_minor_impl() are ignored by the
common code, it is more convenient to ignore make_dev_s() errors there.
It allows, for example, to get device created for the zvol after later
rename instead of having it further stuck in half-created state.
zvol_rename_minor() already ignores those errors.

While there, switch from MAXPHYS to maxphys in FreeBSD 13+.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Tony Nguyen <tony.nguyen@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Alexander Motin <mav@FreeBSD.org>
Sponsored-By: iXsystems, Inc.
Closes #12375
This commit is contained in:
Alexander Motin 2021-07-22 12:22:14 -04:00 committed by Tony Hutter
parent 327f12c291
commit 51e313f610
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
module/os/freebsd/zfs/zvol_os.c
View File

@ -1229,7 +1229,11 @@ zvol_rename_minor(zvol_state_t *zv, const char *newname)
args.mda_si_drv2 = zv; args.mda_si_drv2 = zv;
if (make_dev_s(&args, &dev, "%s/%s", ZVOL_DRIVER, newname) if (make_dev_s(&args, &dev, "%s/%s", ZVOL_DRIVER, newname)
== 0) { == 0) {
#if __FreeBSD_version > 1300130
dev->si_iosize_max = maxphys;
#else
dev->si_iosize_max = MAXPHYS; dev->si_iosize_max = MAXPHYS;
#endif
zsd->zsd_cdev = dev; zsd->zsd_cdev = dev;
} }
} }
@ -1265,9 +1269,10 @@ zvol_free(zvol_state_t *zv)
struct zvol_state_dev *zsd = &zv->zv_zso->zso_dev; struct zvol_state_dev *zsd = &zv->zv_zso->zso_dev;
struct cdev *dev = zsd->zsd_cdev; struct cdev *dev = zsd->zsd_cdev;
ASSERT3P(dev->si_drv2, ==, NULL); if (dev != NULL) {
ASSERT3P(dev->si_drv2, ==, NULL);
destroy_dev(dev); destroy_dev(dev);
}
} }
mutex_destroy(&zv->zv_state_lock); mutex_destroy(&zv->zv_state_lock);
@ -1362,16 +1367,15 @@ zvol_create_minor_impl(const char *name)
args.mda_gid = GID_OPERATOR; args.mda_gid = GID_OPERATOR;
args.mda_mode = 0640; args.mda_mode = 0640;
args.mda_si_drv2 = zv; args.mda_si_drv2 = zv;
error = make_dev_s(&args, &dev, "%s/%s", ZVOL_DRIVER, name); if (make_dev_s(&args, &dev, "%s/%s", ZVOL_DRIVER, name)
if (error) { == 0) {
kmem_free(zv->zv_zso, sizeof (struct zvol_state_os)); #if __FreeBSD_version > 1300130
mutex_destroy(&zv->zv_state_lock); dev->si_iosize_max = maxphys;
kmem_free(zv, sizeof (*zv)); #else
dmu_objset_disown(os, B_TRUE, FTAG); dev->si_iosize_max = MAXPHYS;
goto out_doi; #endif
zsd->zsd_cdev = dev;
} }
dev->si_iosize_max = MAXPHYS;
zsd->zsd_cdev = dev;
} }
(void) strlcpy(zv->zv_name, name, MAXPATHLEN); (void) strlcpy(zv->zv_name, name, MAXPATHLEN);
rw_init(&zv->zv_suspend_lock, NULL, RW_DEFAULT, NULL); rw_init(&zv->zv_suspend_lock, NULL, RW_DEFAULT, NULL);
@ -1444,7 +1448,8 @@ zvol_clear_private(zvol_state_t *zv)
struct zvol_state_dev *zsd = &zv->zv_zso->zso_dev; struct zvol_state_dev *zsd = &zv->zv_zso->zso_dev;
struct cdev *dev = zsd->zsd_cdev; struct cdev *dev = zsd->zsd_cdev;
dev->si_drv2 = NULL; if (dev != NULL)
dev->si_drv2 = NULL;
} }
} }