svn commit: r323753 - stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

Andriy Gapon avg at FreeBSD.org
Tue Sep 19 09:04:31 UTC 2017


Author: avg
Date: Tue Sep 19 09:04:29 2017
New Revision: 323753
URL: https://svnweb.freebsd.org/changeset/base/323753

Log:
  MFC r322234: zfs: no need for __DECONST after abd constification in r322233
  
  Note that vdev_label_write_pad2() is FreeBSD specific.

Modified:
  stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	Tue Sep 19 09:02:26 2017	(r323752)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c	Tue Sep 19 09:04:29 2017	(r323753)
@@ -899,7 +899,7 @@ vdev_label_write_pad2(vdev_t *vd, const char *buf, siz
 
 	pad2 = abd_alloc_for_io(VDEV_PAD_SIZE, B_TRUE);
 	abd_zero(pad2, VDEV_PAD_SIZE);
-	abd_copy_from_buf(pad2, __DECONST(void *, buf), size);
+	abd_copy_from_buf(pad2, buf, size);
 
 retry:
 	zio = zio_root(spa, NULL, NULL, flags);


More information about the svn-src-all mailing list