Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol

This commit is contained in:
Brian Behlendorf 2009-03-12 10:39:17 -07:00
parent 2a002fd082 b9b399bf04
commit e0b048a823
10 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zdb/zdb.c
View File

@ -647,7 +647,7 @@ static int
visit_indirect(spa_t *spa, const dnode_phys_t *dnp, visit_indirect(spa_t *spa, const dnode_phys_t *dnp,
blkptr_t *bp, const zbookmark_t *zb) blkptr_t *bp, const zbookmark_t *zb)
{ {
int err; int err = 0;
if (bp->blk_birth == 0) if (bp->blk_birth == 0)
return (0); return (0);

3
cmd/zfs/zfs_main.c
View File

@ -542,7 +542,7 @@ zfs_do_create(int argc, char **argv)
{ {
zfs_type_t type = ZFS_TYPE_FILESYSTEM; zfs_type_t type = ZFS_TYPE_FILESYSTEM;
zfs_handle_t *zhp = NULL; zfs_handle_t *zhp = NULL;
uint64_t volsize; uint64_t volsize = 0;
int c; int c;
boolean_t noreserve = B_FALSE; boolean_t noreserve = B_FALSE;
boolean_t bflag = B_FALSE; boolean_t bflag = B_FALSE;
@ -4208,6 +4208,7 @@ main(int argc, char **argv)
(void) fprintf(stderr, gettext("unrecognized " (void) fprintf(stderr, gettext("unrecognized "
"command '%s'\n"), cmdname); "command '%s'\n"), cmdname);
usage(B_FALSE); usage(B_FALSE);
ret = 1;
} }
} }

3
cmd/zpool/zpool_main.c
View File

@ -1373,7 +1373,7 @@ zpool_do_import(int argc, char **argv)
char **searchdirs = NULL; char **searchdirs = NULL;
int nsearch = 0; int nsearch = 0;
int c; int c;
int err; int err = 1;
nvlist_t *pools = NULL; nvlist_t *pools = NULL;
boolean_t do_all = B_FALSE; boolean_t do_all = B_FALSE;
boolean_t do_destroyed = B_FALSE; boolean_t do_destroyed = B_FALSE;
@ -3942,6 +3942,7 @@ main(int argc, char **argv)
(void) fprintf(stderr, gettext("unrecognized " (void) fprintf(stderr, gettext("unrecognized "
"command '%s'\n"), cmdname); "command '%s'\n"), cmdname);
usage(B_FALSE); usage(B_FALSE);
ret = 1;
} }
libzfs_fini(g_zfs); libzfs_fini(g_zfs);

2
cmd/zpool/zpool_vdev.c
View File

@ -548,7 +548,7 @@ get_replication(nvlist_t *nvroot, boolean_t fatal)
uint_t c, children; uint_t c, children;
nvlist_t *nv; nvlist_t *nv;
char *type; char *type;
replication_level_t lastrep, rep, *ret; replication_level_t lastrep = { 0 }, rep, *ret;
boolean_t dontreport; boolean_t dontreport;
ret = safe_malloc(sizeof (replication_level_t)); ret = safe_malloc(sizeof (replication_level_t));

2
cmd/ztest/ztest.c
View File

@ -1344,7 +1344,7 @@ ztest_dmu_objset_create_destroy(ztest_args_t *za)
objects = ztest_random(20); objects = ztest_random(20);
seq = 0; seq = 0;
while (objects-- != 0) { while (objects-- != 0) {
uint64_t object; uint64_t object = 0;
dmu_tx_t *tx = dmu_tx_create(os); dmu_tx_t *tx = dmu_tx_create(os);
dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, sizeof (name)); dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, sizeof (name));
error = dmu_tx_assign(tx, TXG_WAIT); error = dmu_tx_assign(tx, TXG_WAIT);

2
lib/libzfs/libzfs_dataset.c
View File

@ -1617,7 +1617,7 @@ zfs_perm_get(zfs_handle_t *zhp, zfs_allow_t **zfs_perms)
char *nvpname; char *nvpname;
uid_t uid; uid_t uid;
gid_t gid; gid_t gid;
avl_tree_t *tree; avl_tree_t *tree = NULL;
avl_index_t where; avl_index_t where;
(void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name)); (void) strlcpy(zc.zc_name, zhp->zfs_name, sizeof (zc.zc_name));

2
lib/libzfs/libzfs_import.c
View File

@ -416,7 +416,7 @@ get_configs(libzfs_handle_t *hdl, pool_list_t *pl, boolean_t active_ok)
pool_entry_t *pe; pool_entry_t *pe;
vdev_entry_t *ve; vdev_entry_t *ve;
config_entry_t *ce; config_entry_t *ce;
nvlist_t *ret = NULL, *config = NULL, *tmp, *nvtop, *nvroot; nvlist_t *ret = NULL, *config = NULL, *tmp = NULL, *nvtop, *nvroot;
nvlist_t **spares, **l2cache; nvlist_t **spares, **l2cache;
uint_t i, nspares, nl2cache; uint_t i, nspares, nl2cache;
boolean_t config_seen; boolean_t config_seen;

2
lib/libzfs/libzfs_util.c
View File

@ -889,7 +889,7 @@ zprop_print_one_property(const char *name, zprop_get_cbdata_t *cbp,
const char *source) const char *source)
{ {
int i; int i;
const char *str; const char *str = NULL;
char buf[128]; char buf[128];
/* /*

2
module/zfs/arc.c
View File

@ -2609,7 +2609,7 @@ top:
uint64_t size = BP_GET_LSIZE(bp); uint64_t size = BP_GET_LSIZE(bp);
arc_callback_t *acb; arc_callback_t *acb;
vdev_t *vd = NULL; vdev_t *vd = NULL;
daddr_t addr; daddr_t addr = -1;
boolean_t devw = B_FALSE; boolean_t devw = B_FALSE;
if (hdr == NULL) { if (hdr == NULL) {

2
module/zfs/dmu.c
View File

@ -189,7 +189,7 @@ dmu_buf_hold_array_by_dnode(dnode_t *dn, uint64_t offset,
uint32_t flags; uint32_t flags;
int err; int err;
zio_t *zio; zio_t *zio;
hrtime_t start; hrtime_t start = 0;
ASSERT(length <= DMU_MAX_ACCESS); ASSERT(length <= DMU_MAX_ACCESS);