From nobody Mon Mar 31 17:44:13 2025 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 4ZRJR21dpCz5sLDc; Mon, 31 Mar 2025 17:44:14 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZRJR20qG2z3hRP; Mon, 31 Mar 2025 17:44:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743443054; 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=gO2046srpOYnifb2Abh/Qsu8x6IxEt6FR3tQ6VBSrYU=; b=gvDJqLw3+M2DwZMQIQDtEeWNCrzEb8xP1if+lrK99ydYbqzFpW92F8MApjAfwbfuhc0nXA 8ylMDsznXkH+DYB5VbBDF31iUZ+oep1MOBJkb3cBOTyQuBewLGhTJgSPkle5CR9yVSgAjr 0PYQ/UCcen5bqBMyVxnqRZWab5iTxGMETUjF5RQUZ2oZWUfRZgO7empWjkNg4AnkR6urVJ 0XjqIxQjiVdXKNLMxuX8ADKcbmP1an0QrQc3i27/sz/agiWeY/pD+yIG7H+la7GvQho2zp 4WsTEDajO74RqEdanjg90DZ3i3WucHVdhmElEUAVz7La3exhodFyKm6S5sKJ+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743443054; a=rsa-sha256; cv=none; b=ZNebnQAXhsfMRJpyvhfFo8HTRAPhmbOur07eau6fYLXi5VMq1Y/tmhhVPS8PpGi7VzwZv6 ZmCqlchldq1ztZyCkOw/ctjVmmOQl2l45y1wm4NpJ9Nk5GhR0WM3nKV88IWSSxwRT01rKF 4GSwzkSMxbb5VzZVO2Pbd8LEPl6jE9rlGcr/JtWq676r0rMcj0V19/AWehBO6htGkmHwG4 NLMpde0YRTCjOro188XrN/jBR5iTEllGGSQjvq+h8qqOTQ7Vg15OY4jEwC6aTvkzflofa2 wD6BzWGfRpED6CnUhrp6I6rWff2gNf9fbTogpxm2JQ3RoWB9t1KZhzYhCAIfyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743443054; 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=gO2046srpOYnifb2Abh/Qsu8x6IxEt6FR3tQ6VBSrYU=; b=fEj/kB2BPOVbzaSdgtqWLqtVcqzo1emjx8EVgx+Cp4EZ1JFcLEdJPGsAl9854s+brHzuG9 JjeW+77HcmEVrcf8TGZq14NdQQW0Xr9y7Wdb1ebnWWuObf0iC6r4oNRF79IR4yJ5msHnbx 5X9VOtV/LozW5d2Fub9jYdak8yQH7fFSZPplkJ816mgbbqatPnLbQ0PnICk/y+WD87Zh1e QQUy/OP0VTsXJ82hwlrcGf5xAedp5aJfH0A51l5ux92tAy0SxTuUnubXowNYV3unoAgkdh n0g8CglolsaBXTC3T35eOm4wJdOrR8+X6hcJ/4n4Ra8Pqp3yICKB7inY7Tqckg== 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 4ZRJR20PJdzvgq; Mon, 31 Mar 2025 17:44:14 +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 52VHiDNC061449; Mon, 31 Mar 2025 17:44:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52VHiDeF061446; Mon, 31 Mar 2025 17:44:13 GMT (envelope-from git) Date: Mon, 31 Mar 2025 17:44:13 GMT Message-Id: <202503311744.52VHiDeF061446@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Gleb Smirnoff Subject: git: eca3c0515b3f - stable/14 - linprocfs: Correct sysfs /proc//mountinfo entry 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: eca3c0515b3f60102ba0f62b72135e6d6dcd4b75 Auto-Submitted: auto-generated The branch stable/14 has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=eca3c0515b3f60102ba0f62b72135e6d6dcd4b75 commit eca3c0515b3f60102ba0f62b72135e6d6dcd4b75 Author: Alex S AuthorDate: 2025-03-10 18:12:36 +0000 Commit: Gleb Smirnoff CommitDate: 2025-03-31 17:42:48 +0000 linprocfs: Correct sysfs /proc//mountinfo entry Technically mount source could be an arbitrary string (since it's effectively ignored), but it's common to repeat fs type there. (cherry picked from commit b9752d5d1cea30a39e89c83ea3aeb539581418cb) --- sys/compat/linprocfs/linprocfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 9e69c92dc014..d4f38b491471 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -448,9 +448,6 @@ linprocfs_docpuinfo(PFS_FILL_ARGS) } #endif /* __i386__ || __amd64__ */ -static const char *path_slash_sys = "/sys"; -static const char *fstype_sysfs = "sysfs"; - static int _mtab_helper(const struct pfs_node *pn, const struct statfs *sp, const char **mntfrom, const char **mntto, const char **fstype) @@ -478,8 +475,7 @@ _mtab_helper(const struct pfs_node *pn, const struct statfs *sp, } if (strcmp(*fstype, "linsysfs") == 0) { - *mntfrom = path_slash_sys; - *fstype = fstype_sysfs; + *mntfrom = *fstype = "sysfs"; } else { /* For Linux msdosfs is called vfat */ if (strcmp(*fstype, "msdosfs") == 0)