From nobody Tue Jan 24 22:14:19 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 4P1h8X008wz3bgqs; Tue, 24 Jan 2023 22:14:20 +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 4P1h8W4Mdtz3LJR; Tue, 24 Jan 2023 22:14:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598459; 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=n8KScbVYimzUt9PERsmfx6UE5Lf3lj41gO8YeerSMFY=; b=UX3frRtvWJjkNe9FFUoCXFQGjfLIfvNQkWEUn9HoSvrzTvJ7DeRLznpwwenXD7+wWmokG5 4KFWRqJmnTHdNTt95IZ9zHS5EMHXRK/JSjUaKKXz04fwyYXfan0Cs7OvmIEv1sDWu29MRT nU47hqHueGtoSEMQXCtLpdPvtEfc86DqpISuZp8go8kGlgx2TsP7krKCEWD0jy89BqoXsp ScRErYKXw/aAQ+7FjyTEIltjgkLSwhYbc/e/hx4sf35KYKI/9nXaU907Qv18thTqh02mbW OLU1iDCrOUoXme6LBdFawcDTOuiy/a/maw/+LJWmZKRgFV4qt0VWjGjwERjVNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598459; 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=n8KScbVYimzUt9PERsmfx6UE5Lf3lj41gO8YeerSMFY=; b=xOo+746Q+V+hO3C8KHWdiMRZgadxg2KyNyl2aOrgwy/fMCP4OE1paat8abqSerQ9zY5S61 IQXwYeVsiA4HFyQWphwrblxZVZv2Myss7r1tGKShOBYAGLu8xYvstZrG9ZT74eVvj/qwyq cC9uFIeA5Pa2J4inluvqT2rgFPcfMv4hTGILmcfIhiCQS5lGjFoYNziwX+k3p76VR3FQrn egxv8cCGs92pAgk0+DsEZakXeOLYA72HcT0Vfcw6QTYgSgEQ0oku6lIYhhkX0jnyBIW5Sn rP2W94fdB0cXMOe3Ap8/h6yfk/XS4i2X6WgqErJy3bvXiXlTI1P5BvWUlZ6s3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598459; a=rsa-sha256; cv=none; b=yyYlNXiXsFgVRuN8Oh05QBvO3BfTGhsTmoHCjTnXVcwiHDLiBEx/NirOWDWvyxuD6Zmuzy W9mCA7LByCRsVOafXkBbrFhOcga64X06XWG7Pa46lVBPT2xdRVEiAKfuLioZo3DUAzhOzN T5IFKBwC4Mcup+pQwFoy2m5yaURH3YZkg5Z3KkaF2ed7+q12XE6+2O7sJeg3H3x+CdhYar qM8QR8DqBanSWANSF9s50W4N3tT8CA+ilveGnfMS5Jrh73nkBFYDe9CjOccFUwk7RrYycW mH1QZERkOx/JENUB8Qho3yPdhtBjF3UsPFCi+xO/4EG2XAw7FszVdUq2NYIqQg== 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 4P1h8W33cRzQfd; Tue, 24 Jan 2023 22:14:19 +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 30OMEJrI089659; Tue, 24 Jan 2023 22:14:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMEJgl089658; Tue, 24 Jan 2023 22:14:19 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:14:19 GMT Message-Id: <202301242214.30OMEJgl089658@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 6ebdd83cae10 - stable/13 - stand/efi: Better variable name 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ebdd83cae10a8660e02fe132c33e93955bfa231 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ebdd83cae10a8660e02fe132c33e93955bfa231 commit 6ebdd83cae10a8660e02fe132c33e93955bfa231 Author: Warner Losh AuthorDate: 2023-01-08 19:00:51 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:45 +0000 stand/efi: Better variable name sanity_check_currdev returns true if it found a kernel or a sane loader config file. A better name for this would be 'bootable' rather than 'rv' which connotes in other places an errno value or similar. Sponsored by: Netflix (cherry picked from commit 23ed2a38c200c93414de20d20f7508f621acecd1) --- stand/efi/loader/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 57a9769f6024..a315fdea8edc 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -267,7 +267,7 @@ probe_zfs_currdev(uint64_t guid) char *devname; struct zfs_devdesc currdev; char *buf = NULL; - bool rv; + bool bootable; currdev.dd.d_dev = &zfs_dev; currdev.dd.d_unit = 0; @@ -277,8 +277,8 @@ probe_zfs_currdev(uint64_t guid) devname = devformat(&currdev.dd); init_zfs_boot_options(devname); - rv = sanity_check_currdev(); - if (rv) { + bootable = sanity_check_currdev(); + if (bootable) { buf = malloc(VDEV_PAD_SIZE); if (buf != NULL) { if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, @@ -291,7 +291,7 @@ probe_zfs_currdev(uint64_t guid) (void) zfs_attach_nvstore(&currdev); } } - return (rv); + return (bootable); } #endif