diff options
| author | mav <mav@FreeBSD.org> | 2015-08-14 09:48:23 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2015-08-14 09:48:23 +0000 |
| commit | 5126ac33efb8fbee8832a6fce5a1d2be65f2b73e (patch) | |
| tree | ee505639f9b6304aa63570485eae1dd9458cbb04 | |
| parent | 3cc7e59c98c7cc13260aa495a033595c744cbafb (diff) | |
| download | FreeBSD-src-5126ac33efb8fbee8832a6fce5a1d2be65f2b73e.zip FreeBSD-src-5126ac33efb8fbee8832a6fce5a1d2be65f2b73e.tar.gz | |
Fix minor mismerge sometimes earlier.
| -rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c index e3f28b4..3e9cdaa 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c @@ -2190,10 +2190,6 @@ arc_buf_data_free(arc_buf_t *buf, void (*free_func)(void *, size_t)) } } -/* - * 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) { |
