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
Fix commit callbacks
[zfs.git]
/
lib
/
libzfs
/
libzfs_pool.c
diff --git
a/lib/libzfs/libzfs_pool.c
b/lib/libzfs/libzfs_pool.c
index
3cb7bbc
..
f1edb77
100644
(file)
--- a/
lib/libzfs/libzfs_pool.c
+++ b/
lib/libzfs/libzfs_pool.c
@@
-62,7
+62,7
@@
typedef struct prop_flags {
static int
zpool_get_all_props(zpool_handle_t *zhp)
{
static int
zpool_get_all_props(zpool_handle_t *zhp)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
@@
-178,6
+178,8
@@
char *
zpool_state_to_name(vdev_state_t state, vdev_aux_t aux)
{
switch (state) {
zpool_state_to_name(vdev_state_t state, vdev_aux_t aux)
{
switch (state) {
+ default:
+ break;
case VDEV_STATE_CLOSED:
case VDEV_STATE_OFFLINE:
return (gettext("OFFLINE"));
case VDEV_STATE_CLOSED:
case VDEV_STATE_OFFLINE:
return (gettext("OFFLINE"));
@@
-421,6
+423,8
@@
zpool_valid_proplist(libzfs_handle_t *hdl, const char *poolname,
* Perform additional checking for specific properties.
*/
switch (prop) {
* Perform additional checking for specific properties.
*/
switch (prop) {
+ default:
+ break;
case ZPOOL_PROP_VERSION:
if (intval < version || intval > SPA_VERSION) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
case ZPOOL_PROP_VERSION:
if (intval < version || intval > SPA_VERSION) {
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
@@
-565,7
+569,7
@@
error:
int
zpool_set_prop(zpool_handle_t *zhp, const char *propname, const char *propval)
{
int
zpool_set_prop(zpool_handle_t *zhp, const char *propname, const char *propval)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
int ret = -1;
char errbuf[1024];
nvlist_t *nvl = NULL;
int ret = -1;
char errbuf[1024];
nvlist_t *nvl = NULL;
@@
-730,7
+734,10
@@
zpool_name_valid(libzfs_handle_t *hdl, boolean_t isopen, const char *pool)
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"multiple '@' delimiters in name"));
break;
zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
"multiple '@' delimiters in name"));
break;
-
+ case NAME_ERR_NO_AT:
+ zfs_error_aux(hdl, dgettext(TEXT_DOMAIN,
+ "permission set is missing '@'"));
+ break;
}
}
return (B_FALSE);
}
}
return (B_FALSE);
@@
-877,7
+884,7
@@
int
zpool_create(libzfs_handle_t *hdl, const char *pool, nvlist_t *nvroot,
nvlist_t *props, nvlist_t *fsprops)
{
zpool_create(libzfs_handle_t *hdl, const char *pool, nvlist_t *nvroot,
nvlist_t *props, nvlist_t *fsprops)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
nvlist_t *zc_fsprops = NULL;
nvlist_t *zc_props = NULL;
char msg[1024];
nvlist_t *zc_fsprops = NULL;
nvlist_t *zc_props = NULL;
char msg[1024];
@@
-1009,7
+1016,7
@@
create_failed:
int
zpool_destroy(zpool_handle_t *zhp)
{
int
zpool_destroy(zpool_handle_t *zhp)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
zfs_handle_t *zfp = NULL;
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
zfs_handle_t *zfp = NULL;
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
@@
-1052,7
+1059,7
@@
zpool_destroy(zpool_handle_t *zhp)
int
zpool_add(zpool_handle_t *zhp, nvlist_t *nvroot)
{
int
zpool_add(zpool_handle_t *zhp, nvlist_t *nvroot)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
int ret;
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
int ret;
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
@@
-1176,7
+1183,7
@@
zpool_add(zpool_handle_t *zhp, nvlist_t *nvroot)
int
zpool_export_common(zpool_handle_t *zhp, boolean_t force, boolean_t hardforce)
{
int
zpool_export_common(zpool_handle_t *zhp, boolean_t force, boolean_t hardforce)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
(void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN,
char msg[1024];
(void) snprintf(msg, sizeof (msg), dgettext(TEXT_DOMAIN,
@@
-1422,7
+1429,7
@@
int
zpool_import_props(libzfs_handle_t *hdl, nvlist_t *config, const char *newname,
nvlist_t *props, int flags)
{
zpool_import_props(libzfs_handle_t *hdl, nvlist_t *config, const char *newname,
nvlist_t *props, int flags)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
zpool_rewind_policy_t policy;
nvlist_t *nv = NULL;
nvlist_t *nvinfo = NULL;
zpool_rewind_policy_t policy;
nvlist_t *nv = NULL;
nvlist_t *nvinfo = NULL;
@@
-1592,7
+1599,7
@@
zpool_import_props(libzfs_handle_t *hdl, nvlist_t *config, const char *newname,
int
zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
{
int
zpool_scan(zpool_handle_t *zhp, pool_scan_func_t func)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
@@
-2136,7
+2143,7
@@
int
zpool_vdev_online(zpool_handle_t *zhp, const char *path, int flags,
vdev_state_t *newstate)
{
zpool_vdev_online(zpool_handle_t *zhp, const char *path, int flags,
vdev_state_t *newstate)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache, islog;
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache, islog;
@@
-2208,7
+2215,7
@@
zpool_vdev_online(zpool_handle_t *zhp, const char *path, int flags,
int
zpool_vdev_offline(zpool_handle_t *zhp, const char *path, boolean_t istmp)
{
int
zpool_vdev_offline(zpool_handle_t *zhp, const char *path, boolean_t istmp)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache;
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache;
@@
-2258,7
+2265,7
@@
zpool_vdev_offline(zpool_handle_t *zhp, const char *path, boolean_t istmp)
int
zpool_vdev_fault(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
{
int
zpool_vdev_fault(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
@@
-2293,7
+2300,7
@@
zpool_vdev_fault(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
int
zpool_vdev_degrade(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
{
int
zpool_vdev_degrade(zpool_handle_t *zhp, uint64_t guid, vdev_aux_t aux)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
@@
-2347,7
+2354,7
@@
int
zpool_vdev_attach(zpool_handle_t *zhp,
const char *old_disk, const char *new_disk, nvlist_t *nvroot, int replacing)
{
zpool_vdev_attach(zpool_handle_t *zhp,
const char *old_disk, const char *new_disk, nvlist_t *nvroot, int replacing)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
int ret;
nvlist_t *tgt;
char msg[1024];
int ret;
nvlist_t *tgt;
@@
-2521,7
+2528,7
@@
zpool_vdev_attach(zpool_handle_t *zhp,
int
zpool_vdev_detach(zpool_handle_t *zhp, const char *path)
{
int
zpool_vdev_detach(zpool_handle_t *zhp, const char *path)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache;
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache;
@@
-2619,7
+2626,7
@@
int
zpool_vdev_split(zpool_handle_t *zhp, char *newname, nvlist_t **newroot,
nvlist_t *props, splitflags_t flags)
{
zpool_vdev_split(zpool_handle_t *zhp, char *newname, nvlist_t **newroot,
nvlist_t *props, splitflags_t flags)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
nvlist_t *tree, *config, **child, **newchild, *newconfig = NULL;
nvlist_t **varray = NULL, *zc_props = NULL;
char msg[1024];
nvlist_t *tree, *config, **child, **newchild, *newconfig = NULL;
nvlist_t **varray = NULL, *zc_props = NULL;
@@
-2830,7
+2837,7
@@
out:
int
zpool_vdev_remove(zpool_handle_t *zhp, const char *path)
{
int
zpool_vdev_remove(zpool_handle_t *zhp, const char *path)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache, islog;
char msg[1024];
nvlist_t *tgt;
boolean_t avail_spare, l2cache, islog;
@@
-2875,7
+2882,7
@@
zpool_vdev_remove(zpool_handle_t *zhp, const char *path)
int
zpool_clear(zpool_handle_t *zhp, const char *path, nvlist_t *rewindnvl)
{
int
zpool_clear(zpool_handle_t *zhp, const char *path, nvlist_t *rewindnvl)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
nvlist_t *tgt;
zpool_rewind_policy_t policy;
char msg[1024];
nvlist_t *tgt;
zpool_rewind_policy_t policy;
@@
-2951,7
+2958,7
@@
zpool_clear(zpool_handle_t *zhp, const char *path, nvlist_t *rewindnvl)
int
zpool_vdev_clear(zpool_handle_t *zhp, uint64_t guid)
{
int
zpool_vdev_clear(zpool_handle_t *zhp, uint64_t guid)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
char msg[1024];
libzfs_handle_t *hdl = zhp->zpool_hdl;
@@
-3035,7
+3042,7
@@
path_to_devid(const char *path)
static void
set_path(zpool_handle_t *zhp, nvlist_t *nv, const char *path)
{
static void
set_path(zpool_handle_t *zhp, nvlist_t *nv, const char *path)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
(void) strncpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
(void) strncpy(zc.zc_value, path, sizeof (zc.zc_value));
(void) strncpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
(void) strncpy(zc.zc_value, path, sizeof (zc.zc_value));
@@
-3186,7
+3193,7
@@
zbookmark_compare(const void *a, const void *b)
int
zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
{
int
zpool_get_errlog(zpool_handle_t *zhp, nvlist_t **nverrlistp)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
uint64_t count;
zbookmark_t *zb = NULL;
int i;
uint64_t count;
zbookmark_t *zb = NULL;
int i;
@@
-3282,7
+3289,7
@@
nomem:
int
zpool_upgrade(zpool_handle_t *zhp, uint64_t new_version)
{
int
zpool_upgrade(zpool_handle_t *zhp, uint64_t new_version)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strcpy(zc.zc_name, zhp->zpool_name);
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strcpy(zc.zc_name, zhp->zpool_name);
@@
-3344,7
+3351,7
@@
zpool_stage_history(libzfs_handle_t *hdl, const char *history_str)
static int
get_history(zpool_handle_t *zhp, char *buf, uint64_t *off, uint64_t *len)
{
static int
get_history(zpool_handle_t *zhp, char *buf, uint64_t *off, uint64_t *len)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
libzfs_handle_t *hdl = zhp->zpool_hdl;
(void) strlcpy(zc.zc_name, zhp->zpool_name, sizeof (zc.zc_name));
@@
-3471,7
+3478,7
@@
void
zpool_obj_to_path(zpool_handle_t *zhp, uint64_t dsobj, uint64_t obj,
char *pathname, size_t len)
{
zpool_obj_to_path(zpool_handle_t *zhp, uint64_t dsobj, uint64_t obj,
char *pathname, size_t len)
{
- zfs_cmd_t zc = { 0 };
+ zfs_cmd_t zc = {
"\0", "\0", "\0", "\0",
0 };
boolean_t mounted = B_FALSE;
char *mntpnt = NULL;
char dsname[MAXNAMELEN];
boolean_t mounted = B_FALSE;
char *mntpnt = NULL;
char dsname[MAXNAMELEN];