From nobody Sun Sep 14 04:53:52 2025 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 4cPbR46RtFz67KJs; Sun, 14 Sep 2025 04:53:52 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cPbR44kVSz3SD4; Sun, 14 Sep 2025 04:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757825632; 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=NAjMcizE+g68SchdgRHz0kxKxKm4/drIq1vQvD59smM=; b=FqEV6FTBFRjccdWMqy0JW3nmLpLIITAgQc5l4e1I2Wp2v6llyR2KV5Ja9ppttKOhGtoUl2 QxBfviybRM5+tif5skIjC10pcHgOquib69ufzolNhbOIJHA9XxGLlPsytTyfndPv6zlH0p wVhPmF/MG396rOdzggzuHa4bfzJ/QXDk0Aie5VmUmRgNlgL+dnbIOR2cLAU6ETi8uL68uY eFRDyx6WGMzSsGm/a+2tGkMFHk6JL3f79YGuJFsqqjgu1GWb2YLaZlwWK5eZ9kyu19jA5h IQoN8WNgdRtMdKmAFizOjdJhmHgUlJxmMsHZVABMaCyCI8X3UUBa6ZpqkESZ3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757825632; 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=NAjMcizE+g68SchdgRHz0kxKxKm4/drIq1vQvD59smM=; b=TtvYoyS/H3sp4rjsRc6/SjlgCcNI9UFgBHcIcVJIc+tXjnY4MmgzV1241hOD5FtJv4IGDL enpCbtDpKbFIDbfm20uHPv2pUArfTAH240LfhcgCP0BKZFiq+nLU4Z/8C4bYdrUNfIDesg gXj8E56dXESeC6q9HfOyw1EkWzugcTO+hMaEJww4zpalVJaAfCtZYxtRON9RU0bQycYM0g ioiyqW7pEoDwtjJ+bATyqzD/1UtwpNISzLZCHtdZuwQZqgXbG2jLzWtL4myUR5WuaM5iXA QjV+plRD+2qPZP+FmusjssUDng7UHmTfHLNuUu+GrvKbZ2ShYgXtGm9VExx4DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757825632; a=rsa-sha256; cv=none; b=tyS0GkCiKHgWM7HDRjW2fN93llOMij1EODYLTZq2t900JIC80ZiC9chnkN0kUd2ER5w5BE 5xT005gokBTnhhJ/A0PLKWEjXCH26vaApe1N/oh2E9uxL9mxjVeszqrwhoeARMm8CeyPTB SHgVYNgfx36LMA4KhoviI4zl7By3+uIoHgdajJBNDAgTarJlS/BmvUCpfGo8piBMnEgxk3 ynt0FPjc/jRvGkZtp/+ihIEp+URksknKvTMxGfsSqPF/Hnxz5OcoRFBCU6lNyGb37TcNJH EgfHAkm5VYXSaKs5tUanoL38OQONOz3+HRqOmvbMTRaXimHbVG1CKcOov4k/kw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cPbR43x1Zz192m; Sun, 14 Sep 2025 04:53:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58E4rqHQ036449; Sun, 14 Sep 2025 04:53:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58E4rqtF036446; Sun, 14 Sep 2025 04:53:52 GMT (envelope-from git) Date: Sun, 14 Sep 2025 04:53:52 GMT Message-Id: <202509140453.58E4rqtF036446@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: bd7032e0b058 - main - GEOM: remove the redundant if statement 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: bd7032e0b0580bc64455dc7c102e87dff6b06c8d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bd7032e0b0580bc64455dc7c102e87dff6b06c8d commit bd7032e0b0580bc64455dc7c102e87dff6b06c8d Author: Wuyang Chung AuthorDate: 2025-07-27 14:13:48 +0000 Commit: Warner Losh CommitDate: 2025-09-14 03:29:00 +0000 GEOM: remove the redundant if statement g_provider_by_name already skips the leading '/dev/' so these if statements are redundant. This changes some error messages, but those aren't parsed. g_concat also calls g_concat_find_disk, but it also skips /dev/ if present at the start of the string. Reviewed by: imp, Elliot Mitchell Pull Request: https://github.com/freebsd/freebsd-src/pull/1793 --- sys/geom/concat/g_concat.c | 2 -- sys/geom/multipath/g_multipath.c | 3 --- sys/geom/part/g_part.c | 2 -- sys/geom/raid/g_raid.c | 2 -- 4 files changed, 9 deletions(-) diff --git a/sys/geom/concat/g_concat.c b/sys/geom/concat/g_concat.c index fe83b54953cc..5461c6dd73d3 100644 --- a/sys/geom/concat/g_concat.c +++ b/sys/geom/concat/g_concat.c @@ -1107,8 +1107,6 @@ g_concat_ctl_append(struct gctl_req *req, struct g_class *mp) gctl_error(req, "No 'arg%u' argument.", 1); goto fail; } - if (strncmp(name, "/dev/", strlen("/dev/")) == 0) - name += strlen("/dev/"); pp = g_provider_by_name(name); if (pp == NULL) { G_CONCAT_DEBUG(1, "Disk %s is invalid.", name); diff --git a/sys/geom/multipath/g_multipath.c b/sys/geom/multipath/g_multipath.c index 250a2c60ffee..4459bd9f03f5 100644 --- a/sys/geom/multipath/g_multipath.c +++ b/sys/geom/multipath/g_multipath.c @@ -949,7 +949,6 @@ g_multipath_ctl_add_name(struct gctl_req *req, struct g_class *mp, struct g_consumer *cp; struct g_provider *pp; const char *mpname; - static const char devpf[6] = _PATH_DEV; int error; g_topology_assert(); @@ -966,8 +965,6 @@ g_multipath_ctl_add_name(struct gctl_req *req, struct g_class *mp, } sc = gp->softc; - if (strncmp(name, devpf, 5) == 0) - name += 5; pp = g_provider_by_name(name); if (pp == NULL) { gctl_error(req, "Provider %s is invalid", name); diff --git a/sys/geom/part/g_part.c b/sys/geom/part/g_part.c index 8a7f67d8a313..4c0d0c3aa902 100644 --- a/sys/geom/part/g_part.c +++ b/sys/geom/part/g_part.c @@ -552,8 +552,6 @@ g_part_parm_provider(struct gctl_req *req, const char *name, pname = gctl_get_asciiparam(req, name); if (pname == NULL) return (ENOATTR); - if (strncmp(pname, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) - pname += sizeof(_PATH_DEV) - 1; pp = g_provider_by_name(pname); if (pp == NULL) { gctl_error(req, "%d %s '%s'", EINVAL, name, pname); diff --git a/sys/geom/raid/g_raid.c b/sys/geom/raid/g_raid.c index 590f28aaa46c..d35695482eea 100644 --- a/sys/geom/raid/g_raid.c +++ b/sys/geom/raid/g_raid.c @@ -775,8 +775,6 @@ g_raid_open_consumer(struct g_raid_softc *sc, const char *name) g_topology_assert(); - if (strncmp(name, _PATH_DEV, 5) == 0) - name += 5; pp = g_provider_by_name(name); if (pp == NULL) return (NULL);