From: Matthew Ahrens <mahrens@delphix.com>
Date: Mon, 1 Oct 2018 17:40:11 +0000 (-0700)
Subject: Remove duplicate macro in dsl_dir.h
X-Git-Tag: zfs-0.8.0-rc2~86
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc23d59fa09f3cd803438986ba70ffcb32b8a036;p=zfs

Remove duplicate macro in dsl_dir.h

The DD_FIELD_LAST_REMAP_TXG macro was added twice (with the same value).
This change removes one of them.

Reviewed-by: Giuseppe Di Natale <guss80@gmail.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Reviewed by: Pavel Zakharov <pavel.zakharov@delphix.com>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Matthew Ahrens <mahrens@delphix.com>
Closes #7968
---

diff --git a/include/sys/dsl_dir.h b/include/sys/dsl_dir.h
index 86bc2dd87..067bcfb6a 100644
--- a/include/sys/dsl_dir.h
+++ b/include/sys/dsl_dir.h
@@ -48,7 +48,6 @@ struct dsl_dataset;
 
 #define	DD_FIELD_FILESYSTEM_COUNT	"com.joyent:filesystem_count"
 #define	DD_FIELD_SNAPSHOT_COUNT		"com.joyent:snapshot_count"
-#define	DD_FIELD_LAST_REMAP_TXG		"com.delphix:last_remap_txg"
 #define	DD_FIELD_CRYPTO_KEY_OBJ		"com.datto:crypto_key_obj"
 #define	DD_FIELD_LAST_REMAP_TXG		"com.delphix:last_remap_txg"