Author: avg
Date: Wed Jun 21 08:12:07 2017
New Revision: 320186
URL: https://svnweb.freebsd.org/changeset/base/320186
Log:
fix several fallouts from r320156, ZFS ABD import
All of the problems were related to the FreeBSD-only features.
One was caused by a mismerge in the zfsbootcfg support code.
All others were in the TRIM support code.
MFC after: 1 week
X-MFC with: r320156
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c Wed Jun
21 08:10:45 2017 (r320185)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c Wed Jun
21 08:12:07 2017 (r320186)
@@ -912,7 +912,7 @@ retry:
goto retry;
}
- zio_buf_free(pad2, VDEV_PAD_SIZE);
+ abd_free(pad2);
return (error);
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
