diff options
| author | Brian Behlendorf <[email protected]> | 2013-01-25 14:57:53 -0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2013-01-25 15:07:40 -0800 |
| commit | 6772fb679a4205427a385d174359b2a5826da613 (patch) | |
| tree | 02ce78b8720573be954e81b4d121df8c9a855886 /include/sys | |
| parent | ba43f4565aa151065dd2b64c1aab8f1051ce1295 (diff) | |
Use dsl_dataset_snap_lookup()
Retire the dmu_snapshot_id() function which was introduced in the
initial .zfs control directory implementation. There is already
an existing dsl_dataset_snap_lookup() which does exactly what we
need, and the dmu_snapshot_id() function as implemented is racy.
https://github.com/zfsonlinux/zfs/issues/1215#issuecomment-12579879
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #1238
Diffstat (limited to 'include/sys')
| -rw-r--r-- | include/sys/dmu.h | 2 | ||||
| -rw-r--r-- | include/sys/dsl_dataset.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/sys/dmu.h b/include/sys/dmu.h index 7fc876be7..2a3a76486 100644 --- a/include/sys/dmu.h +++ b/include/sys/dmu.h @@ -731,7 +731,7 @@ extern uint64_t dmu_objset_syncprop(objset_t *os); extern uint64_t dmu_objset_logbias(objset_t *os); extern int dmu_snapshot_list_next(objset_t *os, int namelen, char *name, uint64_t *id, uint64_t *offp, boolean_t *case_conflict); -extern int dmu_snapshot_id(objset_t *os, const char *snapname, uint64_t *idp); +extern int dmu_snapshot_lookup(objset_t *os, const char *name, uint64_t *val); extern int dmu_snapshot_realname(objset_t *os, char *name, char *real, int maxlen, boolean_t *conflict); extern int dmu_dir_list_next(objset_t *os, int namelen, char *name, diff --git a/include/sys/dsl_dataset.h b/include/sys/dsl_dataset.h index 547951cd0..afcf2b794 100644 --- a/include/sys/dsl_dataset.h +++ b/include/sys/dsl_dataset.h @@ -251,6 +251,8 @@ int dsl_dataset_block_kill(dsl_dataset_t *ds, const blkptr_t *bp, boolean_t dsl_dataset_block_freeable(dsl_dataset_t *ds, const blkptr_t *bp, uint64_t blk_birth); uint64_t dsl_dataset_prev_snap_txg(dsl_dataset_t *ds); +int dsl_dataset_snap_lookup(dsl_dataset_t *ds, const char *name, + uint64_t *value); void dsl_dataset_dirty(dsl_dataset_t *ds, dmu_tx_t *tx); void dsl_dataset_stats(dsl_dataset_t *os, nvlist_t *nv); |