From nobody Tue Jun 27 10:43:44 2023 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 4Qr1Xd0Qv3z4gBYL; Tue, 27 Jun 2023 10:43:45 +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 4Qr1Xd01LCz3lBq; Tue, 27 Jun 2023 10:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687862625; 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=Eo6Xtbvkn4P8qj41D6Rx6j8WCe4ub6q2UNLscjDzsJ8=; b=pc3Lb4KbJzJkp7K9zkMGUBewqyPOd9bye/JCI1CwPffqJGz6qjKzbBBmcK5c2Dv4JU1Kb8 uoSxxd3VVCCS3BDiulGPYx50c5QPj3ofaGE2wcQXCS62C7J4jABg2z7EG5iYJC0LMD9RPz MTShAauGZe9n4+nzAYZNXl9rIwxzl6lizo+THbQbkfoYP0ghIGjvGDaTocNH712WIRBKCo 3LEVBJS9ectv0EOraYdgyFp9hBP8vwyT6KgFbGD9U9BzCrahSUB5J2vTfYDWFeCA/+VbJ/ QFqNszC8mSIJ0F5M32cBcMcdaYcHaXdU7k1e8k7oY1F07qICImuUj+RNZQ5Q2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687862625; 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=Eo6Xtbvkn4P8qj41D6Rx6j8WCe4ub6q2UNLscjDzsJ8=; b=VaCBKcT7OrBfS79kb/i6vhOz2ZL4YYY3dChho16IpoLFO6hTzCfqTrs/+/Xyqn2X0bkngR 1sxtXeEcaLWQFUGLTt3ySr2Z6Jnnh0DlHsv7GrtzXq6O5iFe7MZhXKTe0BgGcQYeikP9Ar kKEPJHt5C9dlKhrDklbJIR4/WEW3SKusO1qWdNqajfsquxeMg13+Pg4xLStb70E1A+oF7K F+T4S2pYURtVc5/wjM8dBRa4dhjf37MvSZEtMxF55IHxsh/AY6LoNt5QHMaoNdBo92H4Jv di527Pn9pohEBJ6nQ5ld3hJcRRH/bqQarGptU3+uT8uHV/GNkDDD4qhcEcolfg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687862625; a=rsa-sha256; cv=none; b=OmfrQaU4UgdI87plsnPBnhYUgKDYeL+crqoV7dtuUFFlCtgyHGNwPHaoCauh7SgLai2cJM lUJt5vEdtPJv3xAGfIgR4Gs/WDlhgyACzFVq4voumi9+XqtGhG5VPPplR3GjdIWdHFUvRs GVlKmOkwjjUWw97WYvGUNqTTXwaVbqghwwNGcByk2nzLs4nWcf02SbGFQKTwvod47J1QHU RXB+9KSJMjOiVeQe8N6FbHv6iH/w6OsR60j44nxydoPEw/75sIjdzgQFwrBkAj4DrfAwvA cMHsrhchBySmv+ehCmAUdfvUhWt7tjZbWuKaaGgeWmjExcuwIfCl+ib+kBmyAQ== 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 4Qr1Xc6C9zzpFk; Tue, 27 Jun 2023 10:43:44 +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 35RAhiL8054423; Tue, 27 Jun 2023 10:43:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35RAhiNA054422; Tue, 27 Jun 2023 10:43:44 GMT (envelope-from git) Date: Tue, 27 Jun 2023 10:43:44 GMT Message-Id: <202306271043.35RAhiNA054422@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 3bffa2262328 - main - fdescfs: improve linrdlnk mount option 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3bffa2262328e4ff1737516f176107f607e7bc76 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3bffa2262328e4ff1737516f176107f607e7bc76 commit 3bffa2262328e4ff1737516f176107f607e7bc76 Author: Konstantin Belousov AuthorDate: 2023-06-22 13:30:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-06-27 10:43:17 +0000 fdescfs: improve linrdlnk mount option Instead of using VV_READLINK vnode flag and checking it in one place, just assign VLNK type to the Fdesc vnodes for linrdlnk mounts. Then all places where symlinks needs to be followed, e.g. lookup(), are handled. PR: 272127 Reported by: Peter Eriksson Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D40700 --- 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 1c4b6d0c6cdb..3f6fca16c715 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -190,8 +190,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); if (error != 0) { vgone(vp); @@ -457,7 +458,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);