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

Merge commit 'refs/top-bases/linux-zpios' into linux-zpios

This commit is contained in:
Brian Behlendorf 2009-07-08 09:19:57 -07:00
parent dd1e80c3c5 33077ad631
commit cfa46b4440
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/zfs/zfs_main.c
View File

@ -2389,7 +2389,7 @@ zfs_do_set(int argc, char **argv)
usage(B_FALSE); usage(B_FALSE);
} }
ret = zfs_for_each(argc - 2, argv + 2, NULL, ret = zfs_for_each(argc - 2, argv + 2, 0,
ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb); ZFS_TYPE_DATASET, NULL, NULL, 0, set_callback, &cb);
return (ret); return (ret);

34
cmd/ztest/ztest.c
View File

@ -1231,6 +1231,8 @@ online_vdev(vdev_t *vd, void *arg)
vdev_t * vdev_t *
vdev_walk_tree(vdev_t *vd, vdev_t *(*func)(vdev_t *, void *), void *arg) vdev_walk_tree(vdev_t *vd, vdev_t *(*func)(vdev_t *, void *), void *arg)
{ {
uint_t c;
if (vd->vdev_ops->vdev_op_leaf) { if (vd->vdev_ops->vdev_op_leaf) {
if (func == NULL) if (func == NULL)
return (vd); return (vd);
@ -1238,7 +1240,7 @@ vdev_walk_tree(vdev_t *vd, vdev_t *(*func)(vdev_t *, void *), void *arg)
return (func(vd, arg)); return (func(vd, arg));
} }
for (uint_t c = 0; c < vd->vdev_children; c++) { for (c = 0; c < vd->vdev_children; c++) {
vdev_t *cvd = vd->vdev_child[c]; vdev_t *cvd = vd->vdev_child[c];
if ((cvd = vdev_walk_tree(cvd, func, arg)) != NULL) if ((cvd = vdev_walk_tree(cvd, func, arg)) != NULL)
return (cvd); return (cvd);
@ -1622,11 +1624,16 @@ ztest_dsl_dataset_cleanup(char *osname, uint64_t curval)
char snap3name[100]; char snap3name[100];
int error; int error;
(void) snprintf(snap1name, 100, "%s@s1_%llu", osname, curval); (void) snprintf(snap1name, 100, "%s@s1_%llu",
(void) snprintf(clone1name, 100, "%s/c1_%llu", osname, curval); osname, (u_longlong_t)curval);
(void) snprintf(snap2name, 100, "%s@s2_%llu", clone1name, curval); (void) snprintf(clone1name, 100, "%s/c1_%llu",
(void) snprintf(clone2name, 100, "%s/c2_%llu", osname, curval); osname, (u_longlong_t)curval);
(void) snprintf(snap3name, 100, "%s@s3_%llu", clone1name, curval); (void) snprintf(snap2name, 100, "%s@s2_%llu",
clone1name, (u_longlong_t)curval);
(void) snprintf(clone2name, 100, "%s/c2_%llu",
osname, (u_longlong_t)curval);
(void) snprintf(snap3name, 100, "%s@s3_%llu",
clone1name, (u_longlong_t)curval);
error = dmu_objset_destroy(clone2name); error = dmu_objset_destroy(clone2name);
if (error && error != ENOENT) if (error && error != ENOENT)
@ -1668,11 +1675,16 @@ ztest_dsl_dataset_promote_busy(ztest_args_t *za)
dmu_objset_name(os, osname); dmu_objset_name(os, osname);
ztest_dsl_dataset_cleanup(osname, curval); ztest_dsl_dataset_cleanup(osname, curval);
(void) snprintf(snap1name, 100, "%s@s1_%llu", osname, curval); (void) snprintf(snap1name, 100, "%s@s1_%llu",
(void) snprintf(clone1name, 100, "%s/c1_%llu", osname, curval); osname, (u_longlong_t)curval);
(void) snprintf(snap2name, 100, "%s@s2_%llu", clone1name, curval); (void) snprintf(clone1name, 100, "%s/c1_%llu",
(void) snprintf(clone2name, 100, "%s/c2_%llu", osname, curval); osname, (u_longlong_t)curval);
(void) snprintf(snap3name, 100, "%s@s3_%llu", clone1name, curval); (void) snprintf(snap2name, 100, "%s@s2_%llu",
clone1name, (u_longlong_t)curval);
(void) snprintf(clone2name, 100, "%s/c2_%llu",
osname, (u_longlong_t)curval);
(void) snprintf(snap3name, 100, "%s@s3_%llu",
clone1name, (u_longlong_t)curval);
error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1, error = dmu_objset_snapshot(osname, strchr(snap1name, '@')+1,
NULL, FALSE); NULL, FALSE);

1
module/zfs/vdev_label.c
View File

@ -510,6 +510,7 @@ vdev_label_init(vdev_t *vd, uint64_t crtxg, vdev_labeltype_t reason)
uint64_t spare_guid = 0, l2cache_guid; uint64_t spare_guid = 0, l2cache_guid;
int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL; int flags = ZIO_FLAG_CONFIG_WRITER | ZIO_FLAG_CANFAIL;
int c, l, n; int c, l, n;
vdev_t *pvd;
ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL); ASSERT(spa_config_held(spa, SCL_ALL, RW_WRITER) == SCL_ALL);