From nobody Mon Oct 19 15:29:28 2026 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 4j7fbs18hnz6vTsx for ; Mon, 19 Oct 2026 15:29:29 +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 4j7fbr5fWpz4KM1 for ; Mon, 19 Oct 2026 15:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792423768; 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=jpuh/Yc+aNWlXrIXmXA+xt6/Vj0omYdAiANFjEuFbNA=; b=cRBdZuuPpfuyETEa6G0+4uuUKf/LFdo67Xz4egt+NeieIsQ7E2fASvK0s49tr48DK3JKCR ZdLHllPruX2Tf3bYH85A0ltBS41DcixQAbW6m91WBXWctbLpLRNCVXlsWjfN71cSuOIWr6 h22nUu95+rDUZQ2uzgCiVT/9HhyKMlzVX1LKYTVTy62tyKYKdcMFkg/79ly5F87tQzXeMl cW4Oa6urpftfpj8ZzpRud9vFwlwffwgVnm2E1O1rvYYILDfh9jOcD7B1rZHP7Aq7YXHG+P /od/e8TZ1S3OObl8MvnOUogIg+sT1YnNjVL6wTMAeKzt9c/3FMXku2+xkgsj8Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1792423768; b=V6TSLQP5oWd8A+dSxVv7xR5XIndN/4OfwwveEJKmwBAkOpzUvzSANmvF4l3P0gACczApBE WVIabaUcYp8xoV+xg3tItj9+awZ4P8EBuwGLGRPkF3QzRYURsMYbBnnDKMRVAYGLMQo/eV M9z5mYnQfUI10NiNis/EUWeogQgy6FVVw8gEeIZvAmh+UCN92DMz2ZW1mCEOo4DG5CkYQW hgDKB0jfsLDZdzvG0vzePeHm3l8cz39CwoGLe+KR5sr0Ued9S3BOdDTzMQ1DksOuIxtUbT OKZsOD9HOuzhrW6RE4yBnH+CsAr6C4ceF1morxUrgxK+GrRbQyGIXGbVOn+zFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1792423768; 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=jpuh/Yc+aNWlXrIXmXA+xt6/Vj0omYdAiANFjEuFbNA=; b=ZWiAnf/JcGKfdceIcvJkBCH0eUtusvWE+xBSbeuG1sRetZTyjb4Kb9ejuWYgPdpV6ASl1k TrUvZ0TqcQx9PzFxZ1BNFh4uZXeEo9HVJ/GWNNnUW78531350j3cRg9NEZ+Z0l9tbWcJD3 JncALGud7VbzvPiAv3qI0NzipCvssmIWGDDZLutXPzVD7wi4jZPPLRLci0uG9oaeTSyRWU ys7hKRSMJq6hg1hSrXtLIXIjy3/R1VOwbWUFM97urmrbTJt/QrtHNffbqUZluaKKXPEQ4+ ECl9rH4LBErFkdehqUfRhElp6DSGLMNfAV+v4HFTFY///q1Mph/yd5ef7ZNEBw== 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 4j7fbr4BjgzQ4V for ; Mon, 19 Oct 2026 15:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44b95 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 19 Oct 2026 15:29:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: de8042811810 - main - inotify: Open target the directory when adding a watch List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the 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/main X-Git-Reftype: branch X-Git-Commit: de80428118101624aaeaae02d59665d1027ff10e Auto-Submitted: auto-generated Date: Mon, 19 Oct 2026 15:29:28 +0000 Message-Id: <6ad63758.44b95.543a118b@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=de80428118101624aaeaae02d59665d1027ff10e commit de80428118101624aaeaae02d59665d1027ff10e Author: Mark Johnston AuthorDate: 2026-10-19 13:44:41 +0000 Commit: Mark Johnston CommitDate: 2026-10-19 15:29:13 +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 --- 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 2cf13a7485eb..13555c2692f9 100644 --- a/sys/kern/vfs_inotify.c +++ b/sys/kern/vfs_inotify.c @@ -785,6 +785,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); @@ -821,6 +829,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); }