diff options
Diffstat (limited to 'include/sys')
-rw-r--r-- | include/sys/zcp.h | 8 | ||||
-rw-r--r-- | include/sys/zvol.h | 16 |
2 files changed, 16 insertions, 8 deletions
diff --git a/include/sys/zcp.h b/include/sys/zcp.h index 5cc520da5..3d1480050 100644 --- a/include/sys/zcp.h +++ b/include/sys/zcp.h @@ -132,6 +132,14 @@ typedef struct zcp_run_info { nvlist_t *zri_outnvl; /* + * The keys of this nvlist are datasets which may be zvols and may need + * to have device minor nodes created. This information is passed from + * syncing context (where the zvol is created) to open context (where we + * create the minor nodes). + */ + nvlist_t *zri_new_zvols; + + /* * The errno number returned to caller of zcp_eval(). */ int zri_result; diff --git a/include/sys/zvol.h b/include/sys/zvol.h index 7852838f8..8efb7f5e6 100644 --- a/include/sys/zvol.h +++ b/include/sys/zvol.h @@ -35,20 +35,20 @@ #define SPEC_MAXOFFSET_T ((1LL << ((NBBY * sizeof (daddr32_t)) + \ DEV_BSHIFT - 1)) - 1) -extern void zvol_create_minors(spa_t *spa, const char *name, boolean_t async); -extern void zvol_remove_minors(spa_t *spa, const char *name, boolean_t async); -extern void zvol_rename_minors(spa_t *spa, const char *oldname, - const char *newname, boolean_t async); +extern void zvol_create_minor(const char *); +extern void zvol_create_minors_recursive(const char *); +extern void zvol_remove_minors(spa_t *, const char *, boolean_t); +extern void zvol_rename_minors(spa_t *, const char *, const char *, boolean_t); #ifdef _KERNEL struct zvol_state; typedef struct zvol_state zvol_state_handle_t; -extern int zvol_check_volsize(uint64_t volsize, uint64_t blocksize); -extern int zvol_check_volblocksize(const char *name, uint64_t volblocksize); -extern int zvol_get_stats(objset_t *os, nvlist_t *nv); +extern int zvol_check_volsize(uint64_t, uint64_t); +extern int zvol_check_volblocksize(const char *, uint64_t); +extern int zvol_get_stats(objset_t *, nvlist_t *); extern boolean_t zvol_is_zvol(const char *); -extern void zvol_create_cb(objset_t *os, void *arg, cred_t *cr, dmu_tx_t *tx); +extern void zvol_create_cb(objset_t *, void *, cred_t *, dmu_tx_t *); extern int zvol_set_volsize(const char *, uint64_t); extern int zvol_set_volblocksize(const char *, uint64_t); extern int zvol_set_snapdev(const char *, zprop_source_t, uint64_t); |