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

Merge branch 'linux-arc' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-07-29 21:27:17 -07:00
parent 95198f4d9b 0d5745b290
commit 640e02d051
3 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libzfs/libzfs_dataset.c
View File

@ -2565,7 +2565,7 @@ zfs_create_ancestors(libzfs_handle_t *hdl, const char *path)
int prefix; int prefix;
uint64_t zoned; uint64_t zoned;
char *path_copy; char *path_copy;
int rc; int rc = 0;
if (check_parents(hdl, path, &zoned, B_TRUE, &prefix) != 0) if (check_parents(hdl, path, &zoned, B_TRUE, &prefix) != 0)
return (-1); return (-1);

36
module/zfs/dmu_objset.c
View File

@ -818,46 +818,50 @@ dmu_objset_snapshot(char *fsname, char *snapname,
nvlist_t *props, boolean_t recursive) nvlist_t *props, boolean_t recursive)
{ {
dsl_sync_task_t *dst; dsl_sync_task_t *dst;
struct snaparg sn; struct snaparg *sn;
spa_t *spa; spa_t *spa;
int err; int err;
(void) strcpy(sn.failed, fsname); sn = kmem_alloc(sizeof (struct snaparg), KM_SLEEP);
(void) strcpy(sn->failed, fsname);
err = spa_open(fsname, &spa, FTAG); err = spa_open(fsname, &spa, FTAG);
if (err) if (err) {
kmem_free(sn, sizeof (struct snaparg));
return (err); return (err);
}
sn.dstg = dsl_sync_task_group_create(spa_get_dsl(spa)); sn->dstg = dsl_sync_task_group_create(spa_get_dsl(spa));
sn.snapname = snapname; sn->snapname = snapname;
sn.props = props; sn->props = props;
if (recursive) { if (recursive) {
sn.checkperms = B_TRUE; sn->checkperms = B_TRUE;
err = dmu_objset_find(fsname, err = dmu_objset_find(fsname,
dmu_objset_snapshot_one, &sn, DS_FIND_CHILDREN); dmu_objset_snapshot_one, sn, DS_FIND_CHILDREN);
} else { } else {
sn.checkperms = B_FALSE; sn->checkperms = B_FALSE;
err = dmu_objset_snapshot_one(fsname, &sn); err = dmu_objset_snapshot_one(fsname, sn);
} }
if (err == 0) if (err == 0)
err = dsl_sync_task_group_wait(sn.dstg); err = dsl_sync_task_group_wait(sn->dstg);
for (dst = list_head(&sn.dstg->dstg_tasks); dst; for (dst = list_head(&sn->dstg->dstg_tasks); dst;
dst = list_next(&sn.dstg->dstg_tasks, dst)) { dst = list_next(&sn->dstg->dstg_tasks, dst)) {
objset_t *os = dst->dst_arg1; objset_t *os = dst->dst_arg1;
dsl_dataset_t *ds = os->os->os_dsl_dataset; dsl_dataset_t *ds = os->os->os_dsl_dataset;
if (dst->dst_err) if (dst->dst_err)
dsl_dataset_name(ds, sn.failed); dsl_dataset_name(ds, sn->failed);
zil_resume(dmu_objset_zil(os)); zil_resume(dmu_objset_zil(os));
dmu_objset_close(os); dmu_objset_close(os);
} }
if (err) if (err)
(void) strcpy(fsname, sn.failed); (void) strcpy(fsname, sn->failed);
dsl_sync_task_group_destroy(sn.dstg); dsl_sync_task_group_destroy(sn->dstg);
spa_close(spa, FTAG); spa_close(spa, FTAG);
kmem_free(sn, sizeof (struct snaparg));
return (err); return (err);
} }

16
module/zfs/spa_history.c
View File

@ -294,15 +294,19 @@ spa_history_log_sync(void *arg1, void *arg2, cred_t *cr, dmu_tx_t *tx)
int int
spa_history_log(spa_t *spa, const char *history_str, history_log_type_t what) spa_history_log(spa_t *spa, const char *history_str, history_log_type_t what)
{ {
history_arg_t ha; history_arg_t *ha;
int err;
ASSERT(what != LOG_INTERNAL); ASSERT(what != LOG_INTERNAL);
ha.ha_history_str = history_str; ha = kmem_alloc(sizeof (history_arg_t), KM_SLEEP);
ha.ha_log_type = what; ha->ha_history_str = history_str;
(void) strlcpy(ha.ha_zone, spa_history_zone(), sizeof (ha.ha_zone)); ha->ha_log_type = what;
return (dsl_sync_task_do(spa_get_dsl(spa), NULL, spa_history_log_sync, (void) strlcpy(ha->ha_zone, spa_history_zone(), sizeof (ha->ha_zone));
spa, &ha, 0)); err = dsl_sync_task_do(spa_get_dsl(spa), NULL, spa_history_log_sync,
spa, ha, 0);
kmem_free(ha, sizeof (history_arg_t));
return (err);
} }
/* /*