From nobody Tue Mar 15 11:42:13 2022 X-Original-To: dev-commits-src-main@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 C95531A11D50; Tue, 15 Mar 2022 11:42:13 +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 4KHs2Y5MPqz3J6d; Tue, 15 Mar 2022 11:42:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647344533; 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=J0Bf80IDyIxPxUzaJCsdiZE65FuUpzyyVJNtH5NHZI8=; b=hrFWdpyVfTVrk03Hua0kqeOQi+nk9fuXeZPFKpaYsp64PkZsEHERJxSMLhTVTyMmywTUsg WmmiLFZyN0Lwyo72IHEfxncsx3uyofTlGsCBtd+vtShK5XBWxC4Qb3bBLaYkQylkbH0z1r 65TsUUFqXeCXG557rOw3cfEDdhhT7QVTlAM/8SbRi4og1ky0kLYrNukN48QfyJ4UGilvFB 4u1LFdD1K8FTkRQilZPr64/9W5JptBTVBNqmk8b36hAO9FMy769l1IpuksSftj7LZ6fB64 H5uooCBfnrLL2XUfPJ7fgygAU6jRZH4R9MEgpYbw9tPvcvMJtmfxVrfgYZqBMg== 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 98965211A9; Tue, 15 Mar 2022 11:42:13 +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 22FBgDmM046860; Tue, 15 Mar 2022 11:42:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FBgDmr046859; Tue, 15 Mar 2022 11:42:13 GMT (envelope-from git) Date: Tue, 15 Mar 2022 11:42:13 GMT Message-Id: <202203151142.22FBgDmr046859@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: b3b50e64d7e4 - main - zfs: add missing replay check to an assert in zfs_xvattr_set List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: b3b50e64d7e4c28bd0fd6323591ed811633826e4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647344533; 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=J0Bf80IDyIxPxUzaJCsdiZE65FuUpzyyVJNtH5NHZI8=; b=hz/3TXJsC8sfLynasWy5j5eVvraftt96l+TNC/vKG93tbj89veeyQl0vHBVBa5bQlRpZBl hi8OS/RSWNwRXJxJ++1lbwE8jKmmQUaBXdY9x9Ol4kiiNwKA58wSRx0hZTYw5NpFaatF9w 7mKXRjeRT7j0oyb7Q9Ts/BmQwJ+k33F51yb37Ti5rGk7fiMtpYI2u18MiJiDYXpHBlwTM4 39E1jkuvLC9tos3LR/h9FNIiwm2C9xrwEolBkG/2iDDefJ8lddH9Iya+wMxEJHS9zcoAYm TXbWIS5tu7OvScu0L01F7On5j13ztRYbKZjAtS2AJBiU6boRKHzF0sXbJFOR6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647344533; a=rsa-sha256; cv=none; b=Hi7UhkSTFrLedFV/6znwDvrrF9x4+o6igHExdbyO6qcV6lQRNWn1YgB4/+WxYLI7xSuNsD bNh29Dc3ph/TklMr+v1tPGe72B+S0hCEXE2MsqtH9nJmz9PNRloD1tAKlOjrL9rEpS6Xil xdr7AJxN667icT/ARvCEGBOtZQcalQMPYVd+YqppJyv3DzrS0r4N1tuCi4hXZwxBBZRJXE uzV6dGeM8Bm2EmaLte0JChM1LgLfvt5XCYLoJBN826fEVZYS30X39KQ3OXi6AulNwKgASk yLcGzb5/lBYW2mP5Ypzc9+C8SWMNc2djZZuwmiCaWOkXpc7hfOztpBP+Lwgefg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b3b50e64d7e4c28bd0fd6323591ed811633826e4 commit b3b50e64d7e4c28bd0fd6323591ed811633826e4 Author: Mateusz Guzik AuthorDate: 2022-03-15 11:38:23 +0000 Commit: Mateusz Guzik CommitDate: 2022-03-15 11:38:58 +0000 zfs: add missing replay check to an assert in zfs_xvattr_set --- sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c index e03840166ba4..51545df8fe45 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c @@ -833,7 +833,9 @@ zfs_xvattr_set(znode_t *zp, xvattr_t *xvap, dmu_tx_t *tx) xoap = xva_getxoptattr(xvap); ASSERT3P(xoap, !=, NULL); - ASSERT_VOP_IN_SEQC(ZTOV(zp)); + if (zp->z_zfsvfs->z_replay == B_FALSE) { + ASSERT_VOP_IN_SEQC(ZTOV(zp)); + } if (XVA_ISSET_REQ(xvap, XAT_CREATETIME)) { uint64_t times[2];