All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jeff Layton <jlayton@kernel.org>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
	 Christian Brauner <brauner@kernel.org>, Jan Kara <jack@suse.cz>,
	 Chuck Lever <chuck.lever@oracle.com>,
	 Alexander Aring <alex.aring@gmail.com>,
	 Steven Rostedt <rostedt@goodmis.org>,
	 Masami Hiramatsu <mhiramat@kernel.org>,
	 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
	 Jonathan Corbet <corbet@lwn.net>,
	Shuah Khan <skhan@linuxfoundation.org>,
	 NeilBrown <neil@brown.name>,
	Olga Kornievskaia <okorniev@redhat.com>,
	 Dai Ngo <Dai.Ngo@oracle.com>, Tom Talpey <tom@talpey.com>,
	 Trond Myklebust <trondmy@kernel.org>,
	Anna Schumaker <anna@kernel.org>,
	 Amir Goldstein <amir73il@gmail.com>
Cc: Calum Mackay <calum.mackay@oracle.com>,
	linux-fsdevel@vger.kernel.org,  linux-kernel@vger.kernel.org,
	linux-trace-kernel@vger.kernel.org,  linux-doc@vger.kernel.org,
	linux-nfs@vger.kernel.org,  Jeff Layton <jlayton@kernel.org>
Subject: [PATCH v3 12/28] nfsd: update the fsnotify mark when setting or removing a dir delegation
Date: Tue, 28 Apr 2026 08:09:56 +0100	[thread overview]
Message-ID: <20260428-dir-deleg-v3-12-5a0780ba9def@kernel.org> (raw)
In-Reply-To: <20260428-dir-deleg-v3-0-5a0780ba9def@kernel.org>

Add a new helper function that will update the mask on the nfsd_file's
fsnotify_mark to be a union of all current directory delegations on an
inode. Call that when directory delegations are added or removed.

Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 fs/nfsd/nfs4state.c | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index bd7e4f9cdaa5..6adce94e9fdb 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1260,6 +1260,37 @@ static void nfsd4_finalize_deleg_timestamps(struct nfs4_delegation *dp, struct f
 	}
 }
 
+static void nfsd_fsnotify_recalc_mask(struct nfsd_file *nf)
+{
+	struct fsnotify_mark *mark = &nf->nf_mark->nfm_mark;
+	struct inode *inode = file_inode(nf->nf_file);
+	u32 lease_mask, set = 0, clear = 0;
+
+	/* This is only needed when adding or removing dir delegs */
+	if (!S_ISDIR(inode->i_mode))
+		return;
+
+	/* Set up notifications for any ignored delegation events */
+	lease_mask = inode_lease_ignore_mask(inode);
+
+	if (lease_mask & FL_IGN_DIR_CREATE)
+		set |= FS_CREATE | FS_MOVED_TO;
+	else
+		clear |= FS_CREATE | FS_MOVED_TO;
+
+	if (lease_mask & FL_IGN_DIR_DELETE)
+		set |= FS_DELETE | FS_MOVED_FROM;
+	else
+		clear |= FS_DELETE | FS_MOVED_FROM;
+
+	if (lease_mask & FL_IGN_DIR_RENAME)
+		set |= FS_RENAME;
+	else
+		clear |= FS_RENAME;
+
+	fsnotify_modify_mark_mask(mark, set, clear);
+}
+
 static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp)
 {
 	struct nfs4_file *fp = dp->dl_stid.sc_file;
@@ -1269,6 +1300,7 @@ static void nfs4_unlock_deleg_lease(struct nfs4_delegation *dp)
 
 	nfsd4_finalize_deleg_timestamps(dp, nf->nf_file);
 	kernel_setlease(nf->nf_file, F_UNLCK, NULL, (void **)&dp);
+	nfsd_fsnotify_recalc_mask(nf);
 	put_deleg_file(fp);
 }
 
@@ -9674,6 +9706,7 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate,
 
 	if (!status) {
 		put_nfs4_file(fp);
+		nfsd_fsnotify_recalc_mask(nf);
 		return dp;
 	}
 

-- 
2.54.0


  parent reply	other threads:[~2026-04-28  7:11 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-04-28  7:09 [PATCH v3 00/28] vfs/nfsd: add support for CB_NOTIFY callbacks in directory delegations Jeff Layton
2026-04-28  7:09 ` [PATCH v3 01/28] filelock: pass current blocking lease to trace_break_lease_block() rather than "new_fl" Jeff Layton
2026-04-28  7:09 ` [PATCH v3 02/28] filelock: add support for ignoring deleg breaks for dir change events Jeff Layton
2026-04-28  7:09 ` [PATCH v3 03/28] filelock: add a tracepoint to start of break_lease() Jeff Layton
2026-04-28  7:09 ` [PATCH v3 04/28] filelock: add an inode_lease_ignore_mask helper Jeff Layton
2026-04-28  7:09 ` [PATCH v3 05/28] fsnotify: new tracepoint in fsnotify() Jeff Layton
2026-04-28  7:09 ` [PATCH v3 06/28] fsnotify: add fsnotify_modify_mark_mask() Jeff Layton
2026-04-28  7:09 ` [PATCH v3 07/28] fsnotify: add FSNOTIFY_EVENT_RENAME data type Jeff Layton
2026-04-28  7:09 ` [PATCH v3 08/28] nfsd: check fl_lmops in nfsd_breaker_owns_lease() Jeff Layton
2026-04-28  7:09 ` [PATCH v3 09/28] nfsd: add protocol support for CB_NOTIFY Jeff Layton
2026-04-28  7:09 ` [PATCH v3 10/28] nfs_common: add new NOTIFY4_* flags proposed in RFC8881bis Jeff Layton
2026-04-28  7:09 ` [PATCH v3 11/28] nfsd: allow nfsd to get a dir lease with an ignore mask Jeff Layton
2026-04-28  7:09 ` Jeff Layton [this message]
2026-04-28  7:09 ` [PATCH v3 13/28] nfsd: make nfsd4_callback_ops->prepare operation bool return Jeff Layton
2026-04-28  7:09 ` [PATCH v3 14/28] nfsd: add callback encoding and decoding linkages for CB_NOTIFY Jeff Layton
2026-04-28  7:09 ` [PATCH v3 15/28] nfsd: use RCU to protect fi_deleg_file Jeff Layton
2026-04-28  7:10 ` [PATCH v3 16/28] nfsd: add data structures for handling CB_NOTIFY Jeff Layton
2026-04-28  7:10 ` [PATCH v3 17/28] nfsd: add notification handlers for dir events Jeff Layton
2026-04-28  7:10 ` [PATCH v3 18/28] nfsd: add tracepoint to dir_event handler Jeff Layton
2026-04-28  7:10 ` [PATCH v3 19/28] nfsd: apply the notify mask to the delegation when requested Jeff Layton
2026-04-28  7:10 ` [PATCH v3 20/28] nfsd: add helper to marshal a fattr4 from completed args Jeff Layton
2026-04-28  7:10 ` [PATCH v3 21/28] nfsd: allow nfsd4_encode_fattr4_change() to work with no export Jeff Layton
2026-04-28  7:10 ` [PATCH v3 22/28] nfsd: send basic file attributes in CB_NOTIFY Jeff Layton
2026-04-28  7:10 ` [PATCH v3 23/28] nfsd: allow encoding a filehandle into fattr4 without a svc_fh Jeff Layton
2026-04-28  7:10 ` [PATCH v3 24/28] nfsd: add a fi_connectable flag to struct nfs4_file Jeff Layton
2026-04-28  7:10 ` [PATCH v3 25/28] nfsd: add the filehandle to returned attributes in CB_NOTIFY Jeff Layton
2026-04-28  7:10 ` [PATCH v3 26/28] nfsd: properly track requested child attributes Jeff Layton
2026-04-28  7:10 ` [PATCH v3 27/28] nfsd: track requested dir attributes Jeff Layton
2026-04-28  7:10 ` [PATCH v3 28/28] nfsd: add support to CB_NOTIFY for dir attribute changes Jeff Layton
2026-04-29 13:41 ` [PATCH v3 00/28] vfs/nfsd: add support for CB_NOTIFY callbacks in directory delegations Chuck Lever
2026-05-15 17:26 ` (subset) " Christian Brauner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260428-dir-deleg-v3-12-5a0780ba9def@kernel.org \
    --to=jlayton@kernel.org \
    --cc=Dai.Ngo@oracle.com \
    --cc=alex.aring@gmail.com \
    --cc=amir73il@gmail.com \
    --cc=anna@kernel.org \
    --cc=brauner@kernel.org \
    --cc=calum.mackay@oracle.com \
    --cc=chuck.lever@oracle.com \
    --cc=corbet@lwn.net \
    --cc=jack@suse.cz \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-trace-kernel@vger.kernel.org \
    --cc=mathieu.desnoyers@efficios.com \
    --cc=mhiramat@kernel.org \
    --cc=neil@brown.name \
    --cc=okorniev@redhat.com \
    --cc=rostedt@goodmis.org \
    --cc=skhan@linuxfoundation.org \
    --cc=tom@talpey.com \
    --cc=trondmy@kernel.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.