git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call zvol_create_minors() in spa_open_common() when initializing pool
[zfs.git]
/
module
/
zfs
/
zfs_ioctl.c
diff --git
a/module/zfs/zfs_ioctl.c
b/module/zfs/zfs_ioctl.c
index
e804cce
..
a9184a1
100644
(file)
--- a/
module/zfs/zfs_ioctl.c
+++ b/
module/zfs/zfs_ioctl.c
@@
-1268,9
+1268,6
@@
zfs_ioc_pool_import(zfs_cmd_t *zc)
error = err;
}
error = err;
}
- if (error == 0)
- zvol_create_minors(zc->zc_name);
-
nvlist_free(config);
if (props)
nvlist_free(config);
if (props)
@@
-1779,7
+1776,7
@@
zfs_ioc_objset_stats_impl(zfs_cmd_t *zc, objset_t *os)
error = zvol_get_stats(os, nv);
if (error == EIO)
return (error);
error = zvol_get_stats(os, nv);
if (error == EIO)
return (error);
- VERIFY
3S(error, ==, 0
);
+ VERIFY
0(error
);
}
if (error == 0)
error = put_nvlist(zc, nv);
}
if (error == 0)
error = put_nvlist(zc, nv);
@@
-2184,6
+2181,9
@@
zfs_prop_set_special(const char *dsname, zprop_source_t source,
case ZFS_PROP_VOLSIZE:
err = zvol_set_volsize(dsname, intval);
break;
case ZFS_PROP_VOLSIZE:
err = zvol_set_volsize(dsname, intval);
break;
+ case ZFS_PROP_SNAPDEV:
+ err = zvol_set_snapdev(dsname, intval);
+ break;
case ZFS_PROP_VERSION:
{
zfs_sb_t *zsb;
case ZFS_PROP_VERSION:
{
zfs_sb_t *zsb;
@@
-5133,8
+5133,6
@@
zfsdev_state_init(struct file *filp)
return (ENXIO);
zs = kmem_zalloc( sizeof(zfsdev_state_t), KM_SLEEP);
return (ENXIO);
zs = kmem_zalloc( sizeof(zfsdev_state_t), KM_SLEEP);
- if (zs == NULL)
- return (ENOMEM);
zs->zs_file = filp;
zs->zs_minor = minor;
zs->zs_file = filp;
zs->zs_minor = minor;