From nobody Thu Feb 22 16:32:15 2024 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 4Tgdw02Rrqz59wwr; Thu, 22 Feb 2024 16:32:16 +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 4Tgdw01GScz4LY6; Thu, 22 Feb 2024 16:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619536; 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=6eH/r9ACSiOzvK6W4DwnfgI4Kkl/hpHlNRiDeNY1u0c=; b=MUbjDLRqiLkSVjSVk3hq8/eaUAD0DYBwr/YWT3ECvpweYbJeUyidQFJP/u0Jek9KX+6mHG BIJs+3b4Ma/7WyqHyhYC41ie1CA3tkCSrubwA2HpjPeih9nXDhQFxjI7EZ9ZyUllBshaDQ sK9/Uiln5mbm1fmQc5HouLJYl59z3GyQ5zVa4+OxbCAq36rjSC79mN/1lXOCkczwabrt7g 60vvxnK4zqv0fZJSrAlIJzAN1AbBLK2Td5vTkPQXv4pDbzVt3ZLVt/+rhSmAve1GhQBnuu yX1S23ojLpUOWRZeUvJGJR6VIHKBI/Vo5EGBndLStQaKDoEGmdNdRzNI//7DBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708619536; 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=6eH/r9ACSiOzvK6W4DwnfgI4Kkl/hpHlNRiDeNY1u0c=; b=ZDUA7iP0hth7234YQGJfGztBVdzZWc8B/YqAqSd31RnNcHzrAZoyZ2q+a+j1dJeiy1t5/Y NC7o1yvE01cFC2dty7pDYKSsgDQGzghzoRHIBDUMD1Zf2g8QsJYZN/cAuoGrFLAGt6OzN5 Hh4DU3Dkxmn08c2V9Z8Qfc0uVSAAFK5X0pSqgESZRQEt5VNFofSmeSSKLPT0k8NOqQfR+B yjX57pqy+QKMw43KBTya+RFjpaKIh8Q1/scyR60CWtSsCrH2y2BHJCEkCgPGS2owAeqaTg PCdjf+hvJMNtC5FFNWuX7Z2+HtdQwBMJeEJPitw7n8XrKb5/ruD+hm79iUYjBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708619536; a=rsa-sha256; cv=none; b=AGj7Zaxheb5mcvUKkv+J8bAFYC82i+9TMSyhvsEirsLGqAwvh1a2N/pyVC0gB+4arCGS5M eQXC7fmgimFj1UQiH0Hxgpgh5PTyaxdJmBaze1CoUsFe6CIKrgoZTp2Q5XV0jzLHWtsHx7 WU3U3Z2+TsApezEpKD7Bo9fuoYlNGwH9v3ww3tQShe0EHnefss4kl26mOp3Hr3xZ1DgnAe M8BqptWKApBQHwpk448Tmp5HTI2l8QeK48czcA/cIR6hDIyAjZVagjgvP1ctHkOMvR3w4j ZpGaFJHXRLhG2Ry0pOMJhYe788MQ0eM+NmPxD5wEXGBHtAr92q0qiBmEmEwo0w== 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 4Tgdw00MNBzfHB; Thu, 22 Feb 2024 16:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41MGWFBN031910; Thu, 22 Feb 2024 16:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41MGWFMd031907; Thu, 22 Feb 2024 16:32:15 GMT (envelope-from git) Date: Thu, 22 Feb 2024 16:32:15 GMT Message-Id: <202402221632.41MGWFMd031907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e54bb0ad8058 - main - loader: return errors from writing ZFS labels 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e54bb0ad8058c0f84ceb08b49bb1d22af829a9e8 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e54bb0ad8058c0f84ceb08b49bb1d22af829a9e8 commit e54bb0ad8058c0f84ceb08b49bb1d22af829a9e8 Author: Warner Losh AuthorDate: 2024-02-22 15:17:56 +0000 Commit: Warner Losh CommitDate: 2024-02-22 16:31:56 +0000 loader: return errors from writing ZFS labels vdev_write_bootenv_impl can only return success. Instead, return the last error. This will make any write errors more visible. The old code masked kboot's inability to write bootenv. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D44018 --- stand/libsa/zfs/zfsimpl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/libsa/zfs/zfsimpl.c b/stand/libsa/zfs/zfsimpl.c index ed9c3753dd19..fc9bedac7621 100644 --- a/stand/libsa/zfs/zfsimpl.c +++ b/stand/libsa/zfs/zfsimpl.c @@ -1688,7 +1688,7 @@ vdev_write_bootenv_impl(vdev_t *vdev, vdev_boot_envblock_t *be) if (kid->v_state != VDEV_STATE_HEALTHY) continue; rc = vdev_write_bootenv_impl(kid, be); - if (rv == 0) + if (rv != 0) rv = rc; }