diff options
| author | Toomas Soome <tsoome@me.com> | 2022-03-12 01:42:13 +0200 |
|---|---|---|
| committer | Toomas Soome <tsoome@me.com> | 2022-03-23 00:17:38 +0200 |
| commit | f43aa5faf71b05bec443dbb0af363ddeaff8ec17 (patch) | |
| tree | e1f02648b79f825ae9d77e61f75d92e147164d13 | |
| parent | 2cd877f8d788934c1ed085b214de3d345d52400b (diff) | |
| download | illumos-joyent-f43aa5faf71b05bec443dbb0af363ddeaff8ec17.tar.gz | |
14562 apparently bad merge in l2arc_write_buffers
Reviewed by: Andy Fiddaman <andy@omnios.org>
Approved by: Dan McDonald <danmcd@joyent.com>
| -rw-r--r-- | usr/src/uts/common/fs/zfs/arc.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/usr/src/uts/common/fs/zfs/arc.c b/usr/src/uts/common/fs/zfs/arc.c index 24b578c208..bf8b77f268 100644 --- a/usr/src/uts/common/fs/zfs/arc.c +++ b/usr/src/uts/common/fs/zfs/arc.c @@ -8576,12 +8576,6 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz) continue; } - /* - * We rely on the L1 portion of the header below, so - * it's invalid for this header to have been evicted out - * of the ghost cache, prior to being written out. The - * ARC_FLAG_L2_WRITING bit ensures this won't happen. - */ ASSERT(HDR_HAS_L1HDR(hdr)); ASSERT3U(HDR_GET_PSIZE(hdr), >, 0); @@ -8605,12 +8599,6 @@ l2arc_write_buffers(spa_t *spa, l2arc_dev_t *dev, uint64_t target_sz) * ARC_FLAG_L2_WRITING bit ensures this won't happen. */ arc_hdr_set_flags(hdr, ARC_FLAG_L2_WRITING); - ASSERT(HDR_HAS_L1HDR(hdr)); - - ASSERT3U(HDR_GET_PSIZE(hdr), >, 0); - ASSERT(hdr->b_l1hdr.b_pabd != NULL || - HDR_HAS_RABD(hdr)); - ASSERT3U(arc_hdr_size(hdr), >, 0); /* * If this header has b_rabd, we can use this since it |