From nobody Mon Oct 26 19:47:04 2026 X-Original-To: dev-commits-src-branches@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 4jD3zs1GBqz6xWmg for ; Mon, 26 Oct 2026 19:47:05 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jD3zs0GMrz4qnP for ; Mon, 26 Oct 2026 19:47:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044025; 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=tptMAGBGWtLU8YFcLFXN5kWPYmr6ObXmJjZ1nwwm3Rk=; b=YVX9lxWCU4QfWhQhHyL8pneDa9mAzXwb6ZWFO3ao+iPcrQNFhCKJynFjKxRPegXxOuY2Qh +pPw64DkuGRNTKA403/rctCBITb8IlpIooK/qM/36ErtdlT5btLdJVbMQJ/M8vtyeNpYCa TuNG15jF+qx8SBrwtwmIRBPST1HefAS4FlWfqc3CmL/DFQbJZtlNRR6Sj0skdR2kmKa33G cvJ5tWDga79oVMxaXC+d/Sbe9yL1+78Q+hWxZ7kmrAlbHOVvGY7pZ81IhbnqU0UvKzBjnA Z4FuVcv88OQ0rPY87S8OePDnqcArpaPqLxwG28EJCNM/WyuofH7hiA2D1HKTmg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793044025; b=dXFqzlhn+c/ULf42Myu1P0oidBfFOZTnlMxZUdKInKN5TLe0BMMcwsAJsnc4tX83NNk9Xx 3M3bMB2WbMiWDGTInr/jJWMJOPD8Z2oWyl1/HZWRlzisrXHBT745ZsUQbD67TArtGcniYe Gqu5f4Ro38V14zccJH7diTn2F5aKJ9V66YegZZQmhPlSTd+pW2bHB9M9htYk2R2d/lm/Kz qf0qKp3w/6+zk2U7R+Jz7+uGSvEbXayjyhmI4dOGz4BuhxE9YToCwU2ZIqQX83eMsZduvS ITdtt9tiv9T1vT8YA76ujv5cNnVRvDGqxdF2jzrZvWiVqsbAAGc1cpI6FgR4pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793044025; 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=tptMAGBGWtLU8YFcLFXN5kWPYmr6ObXmJjZ1nwwm3Rk=; b=ODA/xf/qHYGwWPpwEU6IN0KQguLtu6hpR029jN29tKEK09rN+f7AgU6En4O7l10xMhjkyW 8FbLG9JMW1oKP3ek3S2rRuh/zqfh1cTXpjL+Jwl+Guh8jAz3iDeEE014dhkgNFZGAGEKE2 52kS0QRvt7wHr7/9kh8QfyzmS++rLwJDa0I24QalAaywJ1uX0S9tb0n8ZRWZjy4kAuJCQO DLh4nzkXxOt5UzoxdTvJHHoiF/Ag0vuF/bdOeiEeMdkT+Lv8ymo/4xHNT4t+jI6oQr3gAb axp4v/GngbKqfyumHxmJpY/rCfYo+3MX0j5OwKYZOE6rXN5PT4mGAHQzXtIynA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jD3zr6K5czp18 for ; Mon, 26 Oct 2026 19:47:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 38356 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Oct 2026 19:47:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: a5f61370a36e - stable/14 - inotify: Open target the directory when adding a watch List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5f61370a36e8b102f75facedc3ced59d32aa11b Auto-Submitted: auto-generated Date: Mon, 26 Oct 2026 19:47:04 +0000 Message-Id: <6adfae38.38356.6e388295@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=a5f61370a36e8b102f75facedc3ced59d32aa11b commit a5f61370a36e8b102f75facedc3ced59d32aa11b Author: Mark Johnston AuthorDate: 2026-10-19 13:44:41 +0000 Commit: Mark Johnston CommitDate: 2026-10-26 14:35:02 +0000 inotify: Open target the directory when adding a watch When an application uses inotify to watch a directory, vn_inotify_add_watch() reads the directory entries and does a name lookup so as to induce the filesystem to create namecache entries. Some filesystems expect the directory to be opened before VOP_READDIR can be called, so do that. PR: 299239 Reviewed by: kib MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D60782 (cherry picked from commit de80428118101624aaeaae02d59665d1027ff10e) --- sys/kern/vfs_inotify.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/kern/vfs_inotify.c b/sys/kern/vfs_inotify.c index 2360b59b57f0..463fa8690476 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -781,6 +781,14 @@ vn_inotify_add_watch(struct vnode *vp, struct inotify_softc *sc, uint32_t mask, size_t buflen, len; int eof, error; + /* + * Some filesystems, at least fuse, require that the directory + * be opened before reading it. + */ + error = VOP_OPEN(vp, FREAD, td->td_ucred, td, NULL); + if (error != 0) + return (error); + buflen = 128 * sizeof(struct dirent); buf = malloc(buflen, M_TEMP, M_WAITOK); @@ -817,6 +825,7 @@ vn_inotify_add_watch(struct vnode *vp, struct inotify_softc *sc, uint32_t mask, vrele(nd.ni_vp); } free(buf, M_TEMP); + VOP_CLOSE(vp, FREAD, td->td_ucred, td); if (error != 0) return (error); }