svn commit: r288584 - stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Alexander Motin]

Author: mav
Date: Sat Oct  3 11:15:01 2015
New Revision: 288584
URL: https://svnweb.freebsd.org/changeset/base/288584

Log:
  MFC r286767: Fix minor mismerge sometimes earlier.

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

Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
==============================================================================
--- stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Oct  3 11:14:05 2015	(r288583)
+++ stable/10/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Sat Oct  3 11:15:01 2015	(r288584)
@@ -2193,10 +2193,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)
 {
@@ -2252,6 +2248,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)
 {