review comments

include/sys/spa.h

@@ -373,17 +373,6 @@ typedef struct blkptr {
 	dva_t		blk_dva[SPA_DVAS_PER_BP]; /* Data Virtual Addresses */
 	uint64_t	blk_prop;	/* size, compression, type, etc	    */
 	uint64_t	blk_pad[2];	/* Extra space for the future	    */
-
-	/*
-	 * The following two words MUST NOT be accessed directly.
-	 * The BP_[GET|SET]_BIRTH macros should be used to manipulate the
-	 * physical and logical birth times. Those macros will set/get
-	 * the value in both of the words.
-	 *
-	 * To retrieve or manipulate one of the words, BP_GET_LOGICAL_BIRTH
-	 * and BP_GET_PHYSICAL_BIRTH (and a corresponding SET macro) must be
-	 * used.
-	 */
 	uint64_t	blk_birth_word[2];
 	uint64_t	blk_fill;	/* fill count			    */
 	zio_cksum_t	blk_cksum;	/* 256-bit checksum		    */

module/zfs/vdev_raidz.c

@@ -2192,10 +2192,9 @@ vdev_raidz_close(vdev_t *vd)
  * Return the logical width to use, given the txg in which the allocation
  * happened.  Note that BP_GET_BIRTH() is usually the txg in which the
  * BP was allocated.  Remapped BP's (that were relocated due to device
- * removal, see remap_blkptr_cb()), will have a more recent
- * BP_GET_BIRTH() which reflects when the BP was relocated, but we can
- * ignore these because they can't be on RAIDZ (device removal doesn't
- * support RAIDZ).
+ * removal, see remap_blkptr_cb()), will have a more recent physical birth
+ * which reflects when the BP was relocated, but we can ignore these because
+ * they can't be on RAIDZ (device removal doesn't support RAIDZ).
  */
 static uint64_t
 vdev_raidz_get_logical_width(vdev_raidz_t *vdrz, uint64_t txg)

module/zfs/zio.c

@@ -69,7 +69,6 @@ const char *const zio_type_name[ZIO_TYPES] = {
 int zio_dva_throttle_enabled = B_TRUE;
 static int zio_deadman_log_all = B_FALSE;
 
-
 /*
  * ==========================================================================
  * I/O kmem caches
@@ -1157,8 +1156,8 @@ zfs_blkptr_verify(spa_t *spa, const blkptr_t *bp,
 	/*
 	 * Pool-specific checks.
 	 *
-	 * Note: it would be nice to verify that the BP_GET_LOGICAL_BIRTH()
-	 * and BP_GET_PHYSICAL_BIRTH() are not too large.  However,
+	 * Note: it would be nice to verify that the logical birth
+	 * and physical birth are not too large.  However,
 	 * spa_freeze() allows the birth time of log blocks (and
 	 * dmu_sync()-ed blocks that are in the log) to be arbitrarily
 	 * large.