From nobody Sat Apr 15 21:36:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PzRTc5wzJz457Xy; Sat, 15 Apr 2023 21:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PzRTb6wtVz3yfh; Sat, 15 Apr 2023 21:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjTjaqnxvYxXg3avJX0pi691wUTvDqgXSwsuH1/zUlU=; b=s+O3vhWsgr/ldkYXsLViA8jUyv0IH0/HPOEx5aAr2xv+gsCVtbfXIi631Z4u5ok6aLJfRX v36rerw3HrIl8RMwOS6gtPA0SihWoYFylFG0oekVtbNTIx1rSSuCXyvgR/2+oXGZVesoAW 3578XedTCfibyBmak2D3sT+oopQ1XSaIfg4o+5BTnUj53wsaxylVnaqN/9Wq1MXdWOtWN5 KZftlMeKhbI7TK8Bx893mSuBhgT3twZZLSBVU4VbjrERD6fCwjnkc58cT4w6oUycRL/mKf qzXe6YBtFp8wyofdPXbvtMvDpIo+XeLr6DiQEfkVz/3mTCgpu9fN9heUHqCHpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681594596; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WjTjaqnxvYxXg3avJX0pi691wUTvDqgXSwsuH1/zUlU=; b=qrGf959sMvNi8FgnpeckF7QeduBWRI8WNegriAd/CbEBE02oCxtCS/rp3s8KONW8HQ+9GY 0BIQ4omRDww/onZzRkRw+ZLIrORLnwSUoYTSAs81u0C5gqda1dMqLvgEWsICJQ9oLF0+Ce 9kXR2Lgm8tDNVuK6iGhqYyucKe0xArXrm5T58l7/kKm4piAJ0IRUATHSJQJx9udgPXTRNm O6sw58+xBn8hOtOl7dgH2zj+nad+P9PzTJcRkbBwGgYXIeJwg5f20Qilf3JqRR3M6IoGB+ ghG1/xqyA8hwDfHxo5k7eHId26ydOmy7O25+m+8VlKU9BdotZFdIuXirLx5RrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681594596; a=rsa-sha256; cv=none; b=rQQPclcwmom88KRBChgMroVSek2qky/o8vzkmmxJGR6iGn5vd+aqnfO7quVLDr3zz0qH6J voLnveHPTqkpObb6WUalom1HbTp3HjOsVn79SKBalvVSYzMJyhFUL8gPyLGpKe1PMfKlXW 45FsiMFnuwMOuuBN3UAPKvUr/ZRi23T/QaMCEQY+tD7/2TSSmwnrzQG0ZF3RxmzXILKqLg ZE9keHKJTbsOxCvw+SVxIsInvSfUuvmPIZDlBL8fEwEapbP167vKM4nV/98/3kUoVpiR02 7p4M6yJiK6BWRgyJn6g7adrsMNSAkGXKD5nrteheMSH1VLSM5WqSnkqGU9Phvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PzRTb58YVzMM6; Sat, 15 Apr 2023 21:36:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33FLaZcY004825; Sat, 15 Apr 2023 21:36:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33FLaZ9L004824; Sat, 15 Apr 2023 21:36:35 GMT (envelope-from git) Date: Sat, 15 Apr 2023 21:36:35 GMT Message-Id: <202304152136.33FLaZ9L004824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 63ee747febbf - main - zfs: Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 63ee747febbf024be0aace61161241b53245449e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=63ee747febbf024be0aace61161241b53245449e commit 63ee747febbf024be0aace61161241b53245449e Author: Mateusz Guzik AuthorDate: 2023-04-15 20:24:51 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-15 21:34:54 +0000 zfs: Revert "ZFS_IOC_COUNT_FILLED does unnecessary txg_wait_synced()" This reverts commit 519851122b1703b8445ec17bc89b347cea965bb9. It results in data corruption, see: https://github.com/openzfs/zfs/issues/14753 Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/contrib/openzfs/module/zfs/dnode.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/sys/contrib/openzfs/module/zfs/dnode.c b/sys/contrib/openzfs/module/zfs/dnode.c index 367bfaa80726..d15268cd7bc7 100644 --- a/sys/contrib/openzfs/module/zfs/dnode.c +++ b/sys/contrib/openzfs/module/zfs/dnode.c @@ -1764,29 +1764,20 @@ dnode_try_claim(objset_t *os, uint64_t object, int slots) } /* - * Checks if the dnode might contain any uncommitted changes to data blocks. - * Dirty metadata (e.g. bonus buffer) does not count. + * Checks if the dnode contains any uncommitted dirty records. */ boolean_t dnode_is_dirty(dnode_t *dn) { mutex_enter(&dn->dn_mtx); + for (int i = 0; i < TXG_SIZE; i++) { - list_t *list = &dn->dn_dirty_records[i]; - for (dbuf_dirty_record_t *dr = list_head(list); - dr != NULL; dr = list_next(list, dr)) { - if (dr->dr_dbuf == NULL || - (dr->dr_dbuf->db_blkid != DMU_BONUS_BLKID && - dr->dr_dbuf->db_blkid != DMU_SPILL_BLKID)) { - mutex_exit(&dn->dn_mtx); - return (B_TRUE); - } - } - if (dn->dn_free_ranges[i] != NULL) { + if (multilist_link_active(&dn->dn_dirty_link[i])) { mutex_exit(&dn->dn_mtx); return (B_TRUE); } } + mutex_exit(&dn->dn_mtx); return (B_FALSE); @@ -2650,9 +2641,7 @@ dnode_next_offset(dnode_t *dn, int flags, uint64_t *offset, rw_enter(&dn->dn_struct_rwlock, RW_READER); if (dn->dn_phys->dn_nlevels == 0) { - if (!(flags & DNODE_FIND_HOLE)) { - error = SET_ERROR(ESRCH); - } + error = SET_ERROR(ESRCH); goto out; }