c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-12-27 19:39:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

Build regression in c89 cleanups

Browse Source 
Fixed build regression in non-debug builds from recent cleanups of
c89 workarounds.

Reviewed-by: Tim Chase <tim@chase2k.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Don Brady <don.brady@delphix.com>
Closes #6832
This commit is contained in:
Don Brady 2017-11-07 11:42:15 -07:00 committed by Brian Behlendorf
parent b58b73ce74
commit 31df97cdab
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
module/zfs/arc.c
View File

@ -5663,14 +5663,15 @@ arc_read_done(zio_t *zio)
* read. * read.
*/ */
if (HDR_IN_HASH_TABLE(hdr)) { if (HDR_IN_HASH_TABLE(hdr)) {
arc_buf_hdr_t *found;
ASSERT3U(hdr->b_birth, ==, BP_PHYSICAL_BIRTH(zio->io_bp)); ASSERT3U(hdr->b_birth, ==, BP_PHYSICAL_BIRTH(zio->io_bp));
ASSERT3U(hdr->b_dva.dva_word[0], ==, ASSERT3U(hdr->b_dva.dva_word[0], ==,
BP_IDENTITY(zio->io_bp)->dva_word[0]); BP_IDENTITY(zio->io_bp)->dva_word[0]);
ASSERT3U(hdr->b_dva.dva_word[1], ==, ASSERT3U(hdr->b_dva.dva_word[1], ==,
BP_IDENTITY(zio->io_bp)->dva_word[1]); BP_IDENTITY(zio->io_bp)->dva_word[1]);
arc_buf_hdr_t *found = buf_hash_find(hdr->b_spa, zio->io_bp, found = buf_hash_find(hdr->b_spa, zio->io_bp, &hash_lock);
&hash_lock);
ASSERT((found == hdr && ASSERT((found == hdr &&
DVA_EQUAL(&hdr->b_dva, BP_IDENTITY(zio->io_bp))) || DVA_EQUAL(&hdr->b_dva, BP_IDENTITY(zio->io_bp))) ||