d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If we have to use avl_find(), optimize a bit and use avl_insert() instead of

Browse Source 
avl_add() (the latter is actually a wrapper around avl_find() + avl_insert()).

Fix similar case in the code that is currently commented out.
This commit is contained in:
pjd 2009-09-07 21:58:54 +00:00
parent a72e4e5b62
commit 7b5026505b
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
View File

@ -669,9 +669,12 @@ zfsctl_snapdir_remove(vnode_t *dvp, char *name, vnode_t *cwd, cred_t *cr,
if (sep) {
avl_remove(&sdp->sd_snaps, sep);
err = zfsctl_unmount_snap(sep, MS_FORCE, cr);
if (err)
avl_add(&sdp->sd_snaps, sep);
else
if (err) {
avl_index_t where;
if (avl_find(&sdp->sd_snaps, sep, &where) == NULL)
avl_insert(&sdp->sd_snaps, sep, where);
} else
err = dmu_objset_destroy(snapname);
} else {
err = ENOENT;
@ -1344,6 +1347,8 @@ zfsctl_umount_snapshots(vfs_t *vfsp, int fflags, cred_t *cr)
if (vn_ismntpt(sep->se_root)) {
error = zfsctl_unmount_snap(sep, fflags, cr);
if (error) {
avl_index_t where;
/*
* Before reinserting snapshot to the tree,
* check if it was actually removed. For example
@ -1351,8 +1356,8 @@ zfsctl_umount_snapshots(vfs_t *vfsp, int fflags, cred_t *cr)
* have an error here, but there will be no need
* to reinsert snapshot.
*/
if (avl_find(&sdp->sd_snaps, sep, NULL) == NULL)
avl_add(&sdp->sd_snaps, sep);
if (avl_find(&sdp->sd_snaps, sep, &where) == NULL)
avl_insert(&sdp->sd_snaps, sep, where);
break;
}
}