From nobody Tue Jul 04 03:18:07 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 4Qw7LF0byjz4lVVF; Tue, 4 Jul 2023 03:19:01 +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 4Qw7LD5PvNz412q; Tue, 4 Jul 2023 03:19:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=wpiT+PLKxuj7RP96QyJkxrIYbp+Qs81RROhHVpM9tEI=; b=TGAgKF1IyaYj2anFlHAaKszHHQAShUDdguid6FzbRV6WDGjhbb8QCGrnTQgKTtcN8Pdaf8 dSa9i9W+cQkcjf6wej7tRgh//u1Wotbj3oCdU4juPIk2TQK6tSuHvsVSmFnMcxvDXMlOKh VD67Oexiim8i078uTLLydw6b/tL/gOidn6taIcQ6KROJKMGrudlpyuxAp2Aj+B+2XLUF8m i9fa/sBSwyPrddt9UbigucJFkUfVsFipLeCdUEMfpUJzqFVDghLpMeOU+EdUAPfRN9ncfq FxdbiXLZhP+EDYbvbbWwh+hckdbswBqWBDtk6oDFf8pF1hX8tzQGdnLAU6ggmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688440740; 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=wpiT+PLKxuj7RP96QyJkxrIYbp+Qs81RROhHVpM9tEI=; b=Ezbya//dZQHnndZaquEd3fSmtz2ZT864EBtanp64l84b1K+UA12XIM2k/2+qaIYY96ozQo hIa58Q6eFh3bOfOC8ZVWFm7dl+Unzzeam4wJwvqx01Mw1pkE1NB/mr1ITvzcb4gA6Ai51t lAorVKFM5ldTniQ8J+423+bqnyw8ke73MqvdlL3zLL0jQvUuk20sZxGh3yC52+9GHYqf6M cA35Yl55dzuWlz+xEzM8Xv9uvlrc3uIVEMiiDbtOb0waDHdlh7+ew+k/vLvudfvSi4LNRH xCy8lu49Jxdgjpyns3F3fo7vUVu+045kAejmNM+0W27Zw6Su5uEJjImoadqfYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688440740; a=rsa-sha256; cv=none; b=jF6UrJKoJ7Lafbo5zMIYC79qoz6RjcfmjifWzICVU+GaYVD/ljp7DYz7efKr1M45I9H50r aHN/HAhQ0wu23OV5Mk9ua7/C+myDzWTlRKU0sFjQbCRukDFRdL8IjG06pwIthCaOLJ/jN5 +/9DhECo9IgsfWUEnjNCgH442GeNUAvwdGLtE5XdgtXHo0ri9L/ly3KJvHrcF+1Di6H4oW 63ToY6gtO7pM7A7aFwn0HrtI31m/3GcLeujuRAaOuVbGrEcV4RyYeEpLpDHeyvTa6zT+kY kRfGCABCWYxYxc97jkXxMHjj5KV3Ri4uLwlYK1xHumJ9uBLGZobiTiIc4ymVXQ== 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 4Qw7KC1t3czGR7; Tue, 4 Jul 2023 03:18:07 +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 3643I741009703; Tue, 4 Jul 2023 03:18:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3643I7kn009702; Tue, 4 Jul 2023 03:18:07 GMT (envelope-from git) Date: Tue, 4 Jul 2023 03:18:07 GMT Message-Id: <202307040318.3643I7kn009702@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 109230f383ac - stable/13 - fdescfs: improve linrdlnk mount option 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 109230f383ac5a60a7bd4e40bbde361c28c430cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=109230f383ac5a60a7bd4e40bbde361c28c430cf commit 109230f383ac5a60a7bd4e40bbde361c28c430cf Author: Konstantin Belousov AuthorDate: 2023-06-22 13:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-07-04 03:06:46 +0000 fdescfs: improve linrdlnk mount option PR: 272127 (cherry picked from commit 3bffa2262328e4ff1737516f176107f607e7bc76) --- sys/fs/fdescfs/fdesc_vnops.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 85a3c12f3419..b2ae6964551e 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -204,8 +204,9 @@ loop: fd->fd_type = ftype; fd->fd_fd = fd_fd; fd->fd_ix = ix; - if (ftype == Fdesc && fmp->flags & FMNT_LINRDLNKF) - vp->v_vflag |= VV_READLINK; + /* Cannot set v_type to VCHR */ + if (ftype == Fdesc && (fmp->flags & FMNT_LINRDLNKF) != 0) + vp->v_type = VLNK; error = insmntque1(vp, mp, fdesc_insmntque_dtr, NULL); if (error != 0) { *vpp = NULLVP; @@ -468,7 +469,8 @@ fdesc_getattr(struct vop_getattr_args *ap) break; case Fdesc: - vap->va_type = (vp->v_vflag & VV_READLINK) == 0 ? VCHR : VLNK; + vap->va_type = (VFSTOFDESC(vp->v_mount)->flags & + FMNT_LINRDLNKF) == 0 ? VCHR : VLNK; vap->va_nlink = 1; vap->va_size = 0; vap->va_rdev = makedev(0, vap->va_fileid);