[PATCH v3 23/38] nfsd: update the fsnotify mark when setting or removing a dir delegation

[Jeff Layton]

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.

Signed-off-by: Jeff Layton <jlay...@kernel.org>
---
 fs/nfsd/nfs4state.c | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 
e219556e0959dbf0a8147d5edbb725da125a978f..eac9e9360e568caf1f615d230cff39e022107f12
 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1259,6 +1259,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;
+       else
+               clear |= FS_CREATE;
+
+       if (lease_mask & FL_IGN_DIR_DELETE)
+               set |= FS_DELETE;
+       else
+               clear |= FS_DELETE;
+
+       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;
@@ -1267,6 +1298,7 @@ static void nfs4_unlock_deleg_lease(struct 
nfs4_delegation *dp)
        WARN_ON_ONCE(!fp->fi_delegees);
 
        nfsd4_finalize_deleg_timestamps(dp, nf->nf_file);
+       nfsd_fsnotify_recalc_mask(nf);
        kernel_setlease(nf->nf_file, F_UNLCK, NULL, (void **)&dp);
        put_deleg_file(fp);
 }
@@ -9507,8 +9539,10 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate,
        spin_unlock(&clp->cl_lock);
        spin_unlock(&state_lock);
 
-       if (!status)
+       if (!status) {
+               nfsd_fsnotify_recalc_mask(nf);
                return dp;
+       }
 
        /* Something failed. Drop the lease and clean up the stid */
        kernel_setlease(fp->fi_deleg_file->nf_file, F_UNLCK, NULL, (void 
**)&dp);

-- 
2.51.0