--- a/usr/src/uts/common/fs/zfs/dsl_dataset.c Tue Aug 13 09:02:40 2013 -0700
+++ b/usr/src/uts/common/fs/zfs/dsl_dataset.c Wed Aug 14 11:42:31 2013 -0800
@@ -1722,6 +1722,7 @@
typedef struct dsl_dataset_rollback_arg {
const char *ddra_fsname;
void *ddra_owner;
+ nvlist_t *ddra_result;
} dsl_dataset_rollback_arg_t;
static int
@@ -1793,9 +1794,13 @@
dsl_pool_t *dp = dmu_tx_pool(tx);
dsl_dataset_t *ds, *clone;
uint64_t cloneobj;
+ char namebuf[ZFS_MAXNAMELEN];
VERIFY0(dsl_dataset_hold(dp, ddra->ddra_fsname, FTAG, &ds));
+ dsl_dataset_name(ds->ds_prev, namebuf);
+ fnvlist_add_string(ddra->ddra_result, "target", namebuf);
+
cloneobj = dsl_dataset_create_sync(ds->ds_dir, "%rollback",
ds->ds_prev, DS_CREATE_FLAG_NODIRTY, kcred, tx);
@@ -1811,8 +1816,11 @@
}
/*
+ * Rolls back the given filesystem or volume to the most recent snapshot.
+ * The name of the most recent snapshot will be returned under key "target"
+ * in the result nvlist.
+ *
* If owner != NULL:
- *
* - The existing dataset MUST be owned by the specified owner at entry
* - Upon return, dataset will still be held by the same owner, whether we
* succeed or not.
@@ -1821,15 +1829,16 @@
* notes above zfs_suspend_fs() for further details.
*/
int
-dsl_dataset_rollback(const char *fsname, void *owner)
+dsl_dataset_rollback(const char *fsname, void *owner, nvlist_t *result)
{
dsl_dataset_rollback_arg_t ddra;
ddra.ddra_fsname = fsname;
ddra.ddra_owner = owner;
+ ddra.ddra_result = result;
return (dsl_sync_task(fsname, dsl_dataset_rollback_check,
- dsl_dataset_rollback_sync, (void *)&ddra, 1));
+ dsl_dataset_rollback_sync, &ddra, 1));
}
struct promotenode {