Date: Fri, 14 Aug 2015 09:48:24 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286767 - head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs Message-ID: <201508140948.t7E9mOGS059750@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Fri Aug 14 09:48:23 2015 New Revision: 286767 URL: https://svnweb.freebsd.org/changeset/base/286767 Log: Fix minor mismerge sometimes earlier. Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Aug 14 09:39:23 2015 (r286766) +++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Fri Aug 14 09:48:23 2015 (r286767) @@ -2190,10 +2190,6 @@ arc_buf_data_free(arc_buf_t *buf, void ( } } -/* - * Free up buf->b_data and if 'remove' is set, then pull the - * arc_buf_t off of the the arc_buf_hdr_t's list and free it. - */ static void arc_buf_l2_cdata_free(arc_buf_hdr_t *hdr) { @@ -2249,6 +2245,10 @@ arc_buf_l2_cdata_free(arc_buf_hdr_t *hdr hdr->b_l1hdr.b_tmp_cdata = NULL; } +/* + * Free up buf->b_data and if 'remove' is set, then pull the + * arc_buf_t off of the the arc_buf_hdr_t's list and free it. + */ static void arc_buf_destroy(arc_buf_t *buf, boolean_t remove) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508140948.t7E9mOGS059750>