Merge branch 'gcc-branch' into refs/top-bases/zfs-branch
This commit is contained in:
commit
f86b52a39d
|
@ -3789,7 +3789,7 @@ zfs_rollback(zfs_handle_t *zhp, zfs_handle_t *snap, boolean_t force)
|
|||
zfs_cmd_t zc = { "\0", "\0", "\0", 0 };
|
||||
boolean_t restore_resv = 0;
|
||||
uint64_t old_volsize = 0, new_volsize;
|
||||
zfs_prop_t resv_prop;
|
||||
zfs_prop_t resv_prop = { 0 };
|
||||
|
||||
assert(zhp->zfs_type == ZFS_TYPE_FILESYSTEM ||
|
||||
zhp->zfs_type == ZFS_TYPE_VOLUME);
|
||||
|
|
|
@ -395,7 +395,7 @@ spa_lookup(const char *name)
|
|||
static spa_t search; /* spa_t is large; don't allocate on stack */
|
||||
spa_t *spa;
|
||||
avl_index_t where;
|
||||
char c;
|
||||
char c = 0;
|
||||
char *cp;
|
||||
|
||||
ASSERT(MUTEX_HELD(&spa_namespace_lock));
|
||||
|
|
|
@ -497,7 +497,7 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason)
|
|||
char *buf;
|
||||
size_t buflen;
|
||||
int error;
|
||||
uint64_t spare_guid, l2cache_guid;
|
||||
uint64_t spare_guid = 0, l2cache_guid;
|
||||
int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL;
|
||||
int c, l, n;
|
||||
|
||||
|
|
Loading…
Reference in New Issue