aboutsummaryrefslogtreecommitdiffstats
path: root/module/zfs/zfs_ctldir.c
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2013-01-25 14:57:53 -0800
committerBrian Behlendorf <[email protected]>2013-01-25 15:07:40 -0800
commit6772fb679a4205427a385d174359b2a5826da613 (patch)
tree02ce78b8720573be954e81b4d121df8c9a855886 /module/zfs/zfs_ctldir.c
parentba43f4565aa151065dd2b64c1aab8f1051ce1295 (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 'module/zfs/zfs_ctldir.c')
-rw-r--r--module/zfs/zfs_ctldir.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c
index b3801d494..4fa530b6c 100644
--- a/module/zfs/zfs_ctldir.c
+++ b/module/zfs/zfs_ctldir.c
@@ -443,7 +443,7 @@ zfsctl_snapdir_lookup(struct inode *dip, char *name, struct inode **ipp,
ZFS_ENTER(zsb);
- error = dmu_snapshot_id(zsb->z_os, name, &id);
+ error = dmu_snapshot_lookup(zsb->z_os, name, &id);
if (error) {
ZFS_EXIT(zsb);
return (error);
@@ -909,7 +909,7 @@ zfsctl_lookup_objset(struct super_block *sb, uint64_t objsetid, zfs_sb_t **zsbp)
*/
sep = avl_first(&zsb->z_ctldir_snaps);
while (sep != NULL) {
- error = dmu_snapshot_id(zsb->z_os, sep->se_name, &id);
+ error = dmu_snapshot_lookup(zsb->z_os, sep->se_name, &id);
if (error)
goto out;