zvol: sync with upstream block cloning commit

Signed-off-by: Ameer Hamza <ahamza@ixsystems.com>

include/sys/zvol.h

@@ -56,8 +56,6 @@ extern int zvol_set_ro(const char *, boolean_t);
 extern zvol_state_handle_t *zvol_suspend(const char *);
 extern int zvol_resume(zvol_state_handle_t *);
 extern void *zvol_tag(zvol_state_handle_t *);
-extern int zvol_clone_range(zvol_state_handle_t *, uint64_t,
-    zvol_state_handle_t *, uint64_t, uint64_t);
 
 extern int zvol_init(void);
 extern void zvol_fini(void);

include/sys/zvol_impl.h

@@ -83,14 +83,16 @@ void zvol_log_truncate(zvol_state_t *zv, dmu_tx_t *tx, uint64_t off,
     uint64_t len);
 void zvol_log_write(zvol_state_t *zv, dmu_tx_t *tx, uint64_t offset,
     uint64_t size, boolean_t commit);
-void zvol_log_clone_range(zilog_t *zilog, dmu_tx_t *tx, int txtype,
-    uint64_t off, uint64_t len, uint64_t blksz, const blkptr_t *bps,
-    size_t nbps);
 int zvol_get_data(void *arg, uint64_t arg2, lr_write_t *lr, char *buf,
     struct lwb *lwb, zio_t *zio);
 int zvol_init_impl(void);
 void zvol_fini_impl(void);
 void zvol_wait_close(zvol_state_t *zv);
+int zvol_clone_range(zvol_state_handle_t *, uint64_t,
+    zvol_state_handle_t *, uint64_t, uint64_t);
+void zvol_log_clone_range(zilog_t *zilog, dmu_tx_t *tx, int txtype,
+    uint64_t off, uint64_t len, uint64_t blksz, const blkptr_t *bps,
+    size_t nbps);
 
 /*
  * platform dependent functions exported to platform independent code

module/zfs/zvol.c

@@ -752,6 +752,50 @@ zvol_clone_range(zvol_state_t *zv_src, uint64_t inoff, zvol_state_t *zv_dst,
 	return (SET_ERROR(error));
 }
 
+/*
+ * Handles TX_CLONE_RANGE transactions.
+ */
+void
+zvol_log_clone_range(zilog_t *zilog, dmu_tx_t *tx, int txtype, uint64_t off,
+    uint64_t len, uint64_t blksz, const blkptr_t *bps, size_t nbps)
+{
+	itx_t *itx;
+	lr_clone_range_t *lr;
+	uint64_t partlen, max_log_data;
+	size_t partnbps;
+
+	if (zil_replaying(zilog, tx))
+		return;
+
+	max_log_data = zil_max_log_data(zilog, sizeof (lr_clone_range_t));
+
+	while (nbps > 0) {
+		partnbps = MIN(nbps, max_log_data / sizeof (bps[0]));
+		partlen = partnbps * blksz;
+		ASSERT3U(partlen, <, len + blksz);
+		partlen = MIN(partlen, len);
+
+		itx = zil_itx_create(txtype,
+		    sizeof (*lr) + sizeof (bps[0]) * partnbps);
+		lr = (lr_clone_range_t *)&itx->itx_lr;
+		lr->lr_foid = ZVOL_OBJ;
+		lr->lr_offset = off;
+		lr->lr_length = partlen;
+		lr->lr_blksz = blksz;
+		lr->lr_nbps = partnbps;
+		memcpy(lr->lr_bps, bps, sizeof (bps[0]) * partnbps);
+
+		zil_itx_assign(zilog, itx, tx);
+
+		bps += partnbps;
+		ASSERT3U(nbps, >=, partnbps);
+		nbps -= partnbps;
+		off += partlen;
+		ASSERT3U(len, >=, partlen);
+		len -= partlen;
+	}
+}
+
 static int
 zvol_replay_err(void *arg1, void *arg2, boolean_t byteswap)
 {
@@ -863,50 +907,6 @@ zvol_log_write(zvol_state_t *zv, dmu_tx_t *tx, uint64_t offset,
 	}
 }
 
-/*
- * Handles TX_CLONE_RANGE transactions.
- */
-void
-zvol_log_clone_range(zilog_t *zilog, dmu_tx_t *tx, int txtype, uint64_t off,
-    uint64_t len, uint64_t blksz, const blkptr_t *bps, size_t nbps)
-{
-	itx_t *itx;
-	lr_clone_range_t *lr;
-	uint64_t partlen, max_log_data;
-	size_t partnbps;
-
-	if (zil_replaying(zilog, tx))
-		return;
-
-	max_log_data = zil_max_log_data(zilog, sizeof (lr_clone_range_t));
-
-	while (nbps > 0) {
-		partnbps = MIN(nbps, max_log_data / sizeof (bps[0]));
-		partlen = partnbps * blksz;
-		ASSERT3U(partlen, <, len + blksz);
-		partlen = MIN(partlen, len);
-
-		itx = zil_itx_create(txtype,
-		    sizeof (*lr) + sizeof (bps[0]) * partnbps);
-		lr = (lr_clone_range_t *)&itx->itx_lr;
-		lr->lr_foid = ZVOL_OBJ;
-		lr->lr_offset = off;
-		lr->lr_length = partlen;
-		lr->lr_blksz = blksz;
-		lr->lr_nbps = partnbps;
-		memcpy(lr->lr_bps, bps, sizeof (bps[0]) * partnbps);
-
-		zil_itx_assign(zilog, itx, tx);
-
-		bps += partnbps;
-		ASSERT3U(nbps, >=, partnbps);
-		nbps -= partnbps;
-		off += partlen;
-		ASSERT3U(len, >=, partlen);
-		len -= partlen;
-	}
-}
-
 /*
  * Log a DKIOCFREE/free-long-range to the ZIL with TX_TRUNCATE.
  */