X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=module%2Fzfs%2Fdmu_objset.c;h=1d0b4619fd0f20e612bf529cf8160bcbeae2825c;hb=1c5de20ae2511124613926e4f780572634818218;hp=0ff95a64e0bd0929f87846efe49f657d4d4a3ce0;hpb=54a179e7b80413bd48cd2cd259110fb493d0215e;p=zfs.git

diff --git a/module/zfs/dmu_objset.c b/module/zfs/dmu_objset.c
index 0ff95a6..1d0b461 100644
--- a/module/zfs/dmu_objset.c
+++ b/module/zfs/dmu_objset.c
@@ -910,10 +910,8 @@ dmu_objset_snapshot_one(const char *name, void *arg)
 	 * permission checks for the starting dataset have already been
 	 * performed in zfs_secpolicy_snapshot()
 	 */
-#ifdef HAVE_ZPL
 	if (sn->recursive && (err = zfs_secpolicy_snapshot_perms(name, CRED())))
 		return (err);
-#endif
 
 	err = dmu_objset_hold(name, sn, &os);
 	if (err != 0)
@@ -1586,6 +1584,41 @@ 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)
+{
+	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);
+}
+
 int
 dmu_dir_list_next(objset_t *os, int namelen, char *name,
     uint64_t *idp, uint64_t *offp)