aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/zfs_ioctl.c
diff options
context:
space:
mode:
authorMatthew Macy <[email protected]>2019-09-25 09:20:30 -0700
committerBrian Behlendorf <[email protected]>2019-09-25 09:20:30 -0700
commit5df7e9d85ced424292e8312a7848b6092a29c930 (patch)
tree391e1488d4a8081ce22c7401c6392a72dc661c13 /module/zfs/zfs_ioctl.c
parentd359e99c38f66732d42278c32d52cfcf1839aa4f (diff)
OpenZFS restructuring - zvol
Refactor the zvol in to platform dependent and independent bits. Reviewed-by: Allan Jude <[email protected]> Reviewed-by: Jorgen Lundman <[email protected]> Reviewed-by: Igor Kozhukhov <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Matt Macy <[email protected]> Closes #9295
Diffstat (limited to 'module/zfs/zfs_ioctl.c')
-rw-r--r--module/zfs/zfs_ioctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/module/zfs/zfs_ioctl.c b/module/zfs/zfs_ioctl.c
index fce074147..39718a9a8 100644
--- a/module/zfs/zfs_ioctl.c
+++ b/module/zfs/zfs_ioctl.c
@@ -4136,7 +4136,7 @@ static int
zfs_ioc_rollback(const char *fsname, nvlist_t *innvl, nvlist_t *outnvl)
{
zfsvfs_t *zfsvfs;
- zvol_state_t *zv;
+ zvol_state_handle_t *zv;
char *target = NULL;
int error;
@@ -4861,7 +4861,7 @@ zfs_ioc_recv_impl(char *tofs, char *tosnap, char *origin, nvlist_t *recvprops,
if (error == 0) {
zfsvfs_t *zfsvfs = NULL;
- zvol_state_t *zv = NULL;
+ zvol_state_handle_t *zv = NULL;
if (getzfsvfs(tofs, &zfsvfs) == 0) {
/* online recv */
@@ -7671,7 +7671,7 @@ _init(void)
{
int error;
- if ((error = -zvol_init()) != 0)
+ if ((error = zvol_init()) != 0)
return (error);
spa_init(FREAD | FWRITE);