diff options
| author | Dan McDonald <danmcd@joyent.com> | 2022-03-23 10:23:28 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2022-03-23 10:23:28 -0400 |
| commit | f3f1ccfd526dca4d7cc2209b45f8bbd6b5b597e3 (patch) | |
| tree | 0e193db03e65580baec2db497caed34e02f13211 /usr/src/uts/common/fs | |
| parent | 4822583a749a4edd3974bf4dbe2a30bca716bece (diff) | |
| parent | d3477c6d12fcb86e8bb78faf6993ae16c81cbe12 (diff) | |
| download | illumos-joyent-f3f1ccfd526dca4d7cc2209b45f8bbd6b5b597e3.tar.gz | |
[illumos-gate merge]release-20220324
commit d3477c6d12fcb86e8bb78faf6993ae16c81cbe12
14576 absent framebuffer prevents console-login on all serial ports
commit f43aa5faf71b05bec443dbb0af363ddeaff8ec17
14562 apparently bad merge in l2arc_write_buffers
commit 2cd877f8d788934c1ed085b214de3d345d52400b
14573 need ncurses check_rtime exceptions for python 3.9 on openindiana
Diffstat (limited to 'usr/src/uts/common/fs')
| -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 db64ef9a70..12b5872cdc 100644 --- a/usr/src/uts/common/fs/zfs/arc.c +++ b/usr/src/uts/common/fs/zfs/arc.c @@ -8589,12 +8589,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); @@ -8618,12 +8612,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 |