X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fdmu_objset.c;h=c59973a77d2afb52b21c7a2c94860e3b9d910ae4;hb=36f86f73f68548f46eb3229c8adf583d59fa9988;hp=c1bc1de7be2010d8b8f041dff860ed167da8f935;hpb=04434775b7f3aa55fbbcf2064cfb9f5f5c436e64;p=zfs.git

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index c1bc1de..c59973a 100644
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -848,7 +848,7 @@ snapshot_check(void *arg1, void *arg2, dmu_tx_t *tx)
 		if (strlen(sn->htag) + MAX_TAG_PREFIX_LEN >= MAXNAMELEN)
 			return (E2BIG);
 
-		sn->ha = kmem_alloc(sizeof (struct dsl_ds_holdarg), KM_SLEEP);
+		sn->ha = kmem_alloc(sizeof(struct dsl_ds_holdarg), KM_PUSHPAGE);
 		sn->ha->temphold = B_TRUE;
 		sn->ha->htag = sn->htag;
 	}
@@ -1573,39 +1573,10 @@ dmu_snapshot_list_next(objset_t *os, int namelen, char *name,
 	return (0);
 }
 
-/*
- * Determine the objset id for a given snapshot name.
- */
 int
-dmu_snapshot_id(objset_t *os, const char *snapname, uint64_t *idp)
+dmu_snapshot_lookup(objset_t *os, const char *name, uint64_t *value)
 {
-	dsl_dataset_t *ds = os->os_dsl_dataset;
-	zap_cursor_t cursor;
-	zap_attribute_t attr;
-	int error;
-
-	if (ds->ds_phys->ds_snapnames_zapobj == 0)
-		return (ENOENT);
-
-	zap_cursor_init(&cursor, ds->ds_dir->dd_pool->dp_meta_objset,
-	    ds->ds_phys->ds_snapnames_zapobj);
-
-	error = zap_cursor_move_to_key(&cursor, snapname, MT_EXACT);
-	if (error) {
-		zap_cursor_fini(&cursor);
-		return (error);
-	}
-
-	error = zap_cursor_retrieve(&cursor, &attr);
-	if (error) {
-		zap_cursor_fini(&cursor);
-		return (error);
-	}
-
-	*idp = attr.za_first_integer;
-	zap_cursor_fini(&cursor);
-
-	return (0);
+	return dsl_dataset_snap_lookup(os->os_dsl_dataset, name, value);
 }
 
 int