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

Abstract away platform specific superblock references 

The zfsvfs->z_sb field is Linux specified and should be abstracted.

Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #9697
This commit is contained in:
Matthew Macy 2019-12-10 09:21:07 -08:00 committed by Brian Behlendorf
parent 7bda69a1a9
commit 362ae8d11f
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sys/zfs_ioctl_impl.h
View File

@ -82,7 +82,9 @@ void zfs_ioctl_register(const char *, zfs_ioc_t, zfs_ioc_func_t *,
void zfs_ioctl_init_os(void); void zfs_ioctl_init_os(void);
boolean_t zfs_vfs_held(zfsvfs_t *);
int zfs_vfs_ref(zfsvfs_t **); int zfs_vfs_ref(zfsvfs_t **);
void zfs_vfs_rele(zfsvfs_t *);
long zfsdev_ioctl_common(uint_t, zfs_cmd_t *); long zfsdev_ioctl_common(uint_t, zfs_cmd_t *);
int zfsdev_attach(void); int zfsdev_attach(void);

12
module/os/linux/zfs/zfs_ioctl_os.c
View File

@ -65,6 +65,12 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/slab.h> #include <linux/slab.h>
boolean_t
zfs_vfs_held(zfsvfs_t *zfsvfs)
{
return (zfsvfs->z_sb != NULL);
}
int int
zfs_vfs_ref(zfsvfs_t **zfvp) zfs_vfs_ref(zfsvfs_t **zfvp)
{ {
@ -75,6 +81,12 @@ zfs_vfs_ref(zfsvfs_t **zfvp)
return (0); return (0);
} }
void
zfs_vfs_rele(zfsvfs_t *zfsvfs)
{
deactivate_super(zfsvfs->z_sb);
}
static int static int
zfsdev_state_init(struct file *filp) zfsdev_state_init(struct file *filp)
{ {

10
module/zfs/zfs_ioctl.c
View File

@ -1442,8 +1442,8 @@ zfsvfs_rele(zfsvfs_t *zfsvfs, void *tag)
{ {
rrm_exit(&zfsvfs->z_teardown_lock, tag); rrm_exit(&zfsvfs->z_teardown_lock, tag);
if (zfsvfs->z_sb) { if (zfs_vfs_held(zfsvfs)) {
deactivate_super(zfsvfs->z_sb); zfs_vfs_rele(zfsvfs);
} else { } else {
dmu_objset_disown(zfsvfs->z_os, B_TRUE, zfsvfs); dmu_objset_disown(zfsvfs->z_os, B_TRUE, zfsvfs);
zfsvfs_free(zfsvfs); zfsvfs_free(zfsvfs);
@ -4133,7 +4133,7 @@ zfs_ioc_rollback(const char *fsname, nvlist_t *innvl, nvlist_t *outnvl)
resume_err = zfs_resume_fs(zfsvfs, ds); resume_err = zfs_resume_fs(zfsvfs, ds);
error = error ? error : resume_err; error = error ? error : resume_err;
} }
deactivate_super(zfsvfs->z_sb); zfs_vfs_rele(zfsvfs);
} else if ((zv = zvol_suspend(fsname)) != NULL) { } else if ((zv = zvol_suspend(fsname)) != NULL) {
error = dsl_dataset_rollback(fsname, target, zvol_tag(zv), error = dsl_dataset_rollback(fsname, target, zvol_tag(zv),
outnvl); outnvl);
@ -4866,7 +4866,7 @@ zfs_ioc_recv_impl(char *tofs, char *tosnap, char *origin, nvlist_t *recvprops,
error = zfs_resume_fs(zfsvfs, ds); error = zfs_resume_fs(zfsvfs, ds);
} }
error = error ? error : end_err; error = error ? error : end_err;
deactivate_super(zfsvfs->z_sb); zfs_vfs_rele(zfsvfs);
} else if ((zv = zvol_suspend(tofs)) != NULL) { } else if ((zv = zvol_suspend(tofs)) != NULL) {
error = dmu_recv_end(&drc, zvol_tag(zv)); error = dmu_recv_end(&drc, zvol_tag(zv));
zvol_resume(zv); zvol_resume(zv);
@ -5784,7 +5784,7 @@ zfs_ioc_userspace_upgrade(zfs_cmd_t *zc)
} }
if (error == 0) if (error == 0)
error = dmu_objset_userspace_upgrade(zfsvfs->z_os); error = dmu_objset_userspace_upgrade(zfsvfs->z_os);
deactivate_super(zfsvfs->z_sb); zfs_vfs_rele(zfsvfs);
} else { } else {
/* XXX kind of reading contents without owning */ /* XXX kind of reading contents without owning */
error = dmu_objset_hold_flags(zc->zc_name, B_TRUE, FTAG, &os); error = dmu_objset_hold_flags(zc->zc_name, B_TRUE, FTAG, &os);