From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF68637DAC2; Fri, 22 May 2026 19:42:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779478960; cv=none; b=gNOBE6dXfRBeANF/GLFL9496Rw4wi7C4EHB0N5pcmhnDQzlWaw88r08EKomTxPgu58wbDFzQqw9jjBnrZRZYENd8Teeaa7uu4HVl1vp0is/14KsBSWuB1ly+1L1mEvgb1Iqv3ipoKi3vlg9zX4vAFo7erFd0nPQx0IwTmSMRqzg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779478960; c=relaxed/simple; bh=6+xgS9Oi//iUZD1ri3viy4fOOkWtg6yKfKkrsgbZtwo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DxAmQm6rhHYpL15/3IIHo7N3XI/V6CKdBNZeXZlnkYDGNgjqgbixSI8t0urPGj9GZSNr4K9fQMzbtfBIoOumAml32G2XOmmddAd0ffDzc7LhZgr46J8AMaOkf3sYoc+q6ZR7vm+KQBrH211NzanDTuypuVzQQ62ks1a9p8w904Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=gaGbHw9u; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="gaGbHw9u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2EE8E1F00A3D; Fri, 22 May 2026 19:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779478957; bh=yn+E0MiyGHjI4tTcZW7VzxHDKSKAvs1i4UMk8wxbinU=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=gaGbHw9u7brDFj7avc7wDzaPMTRPI39HDoedRCPYSRitcECMKChVIHC8zEosH7b04 SUX2k5ACohh9GaA6Q1FLndnZQzBp4Jwxz0GsYc1T+Jqawlm3AN5VU7dwTDbh8tNr0X hhh7U+lf+CEpiaXglD46rFXkvJeobM06vpkArBF22T5olRg6DroWU0nlpD1CX1o4Rz LAwuJxpcHsjr1ttW1YFnu65ihqzo1E7d6EBeIyPXaMiysYuzf945tCnSp15uisUvPi Vp+A3VH8vH3IPK692+cY+RZny4uDX0pdNtAhRrbXhpdbub9/8WZdN6HdbRZe5zvBHf HpeQ4izYdDN8A== From: Jeff Layton Date: Fri, 22 May 2026 15:42:09 -0400 Subject: [PATCH v5 04/21] nfsd: allow nfsd to get a dir lease with an ignore mask Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260522-dir-deleg-v5-4-542cddfad576@kernel.org> References: <20260522-dir-deleg-v5-0-542cddfad576@kernel.org> In-Reply-To: <20260522-dir-deleg-v5-0-542cddfad576@kernel.org> To: Chuck Lever , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Jonathan Corbet , Shuah Khan Cc: Steven Rostedt , Alexander Aring , Amir Goldstein , Jan Kara , Alexander Viro , Christian Brauner , Calum Mackay , linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-nfs@vger.kernel.org, Jeff Layton X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2342; i=jlayton@kernel.org; h=from:subject:message-id; bh=6+xgS9Oi//iUZD1ri3viy4fOOkWtg6yKfKkrsgbZtwo=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqELGdIfAeqY/TeCUSnSt3PnsVR37X5WfEtjz61 p72CTTa3qaJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahCxnQAKCRAADmhBGVaC FUStD/4hmSTwIH+z8GJlkcFPnFpSQtdWtAWO6vIqe4KSvNnvDu4LTCC5syJVuGvdayenSHY/Vxp tqE2Itwm3rVoOkwFslBewOmbEKQIs8QkrWDaAr6gDzVvK0268W88ncFItEkZ09xc+UA0uOL8aso cy1Fayyy4Z2f8tj4mgFqb5XP8sISgOcuLcBc0v6/f0RcsKO+9BQOTZ0kLpZHtpkJxhJqZDplVF5 o7zTLxU+nB8iVDwbdzZhJg6iEj6w0hSOOWOBcchLnKd0e6dw29IhmWi60GQGOYrJeuqz66M0hc2 pplEFM4fLQ1j9Jbwi73iTqi9nTd1lFP82/y8l3ZGTLaGcdIBwJco25zTHL05f6mkyYPbYFNtJQ5 cyMcseaGY0jR431hBESIH7/h7/l1291ziKP92wnZFPd2O51tzpBAEEgZ2zMsiKJ2FFKQw1AGjMN izX+XiBn3j0yJ1FcWJmmL7d87IosPAn97UJTv7rRhDG4I5qqufxeHwIAZh1fUdVum4rp2QTA02f fik5YzsOxR+qJeGWkoB6gbBlCuXz1a4htO8sXTodQN2IEYQxXVY4gx/z63cnqQ3uZ+NxmLSb4/G 5mO8eIFdrEwqs1sVPdooAfS8luY0f/iGJViaB3utZ0nvkNaK6ABTnTKDXr3t77g2Ac4leSVyZcL cuqwxBGYgFnd15w== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 When requesting a directory lease, enable the FL_IGN_DIR_* bits that correspond to the requested notification types. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4state.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 67e163ee13a2..2a34ba457b74 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -6048,7 +6048,22 @@ static bool nfsd4_cb_channel_good(struct nfs4_client *clp) return clp->cl_minorversion && clp->cl_cb_state == NFSD4_CB_UNKNOWN; } -static struct file_lease *nfs4_alloc_init_lease(struct nfs4_delegation *dp) +static unsigned int +nfsd_notify_to_ignore(u32 notify) +{ + unsigned int mask = 0; + + if (notify & BIT(NOTIFY4_REMOVE_ENTRY)) + mask |= FL_IGN_DIR_DELETE; + if (notify & BIT(NOTIFY4_ADD_ENTRY)) + mask |= FL_IGN_DIR_CREATE; + if (notify & BIT(NOTIFY4_RENAME_ENTRY)) + mask |= FL_IGN_DIR_RENAME; + + return mask; +} + +static struct file_lease *nfs4_alloc_init_lease(struct nfs4_delegation *dp, u32 notify) { struct file_lease *fl; @@ -6056,7 +6071,7 @@ static struct file_lease *nfs4_alloc_init_lease(struct nfs4_delegation *dp) if (!fl) return NULL; fl->fl_lmops = &nfsd_lease_mng_ops; - fl->c.flc_flags = FL_DELEG; + fl->c.flc_flags = FL_DELEG | nfsd_notify_to_ignore(notify); fl->c.flc_type = deleg_is_read(dp->dl_type) ? F_RDLCK : F_WRLCK; fl->c.flc_owner = (fl_owner_t)dp; fl->c.flc_pid = current->tgid; @@ -6273,7 +6288,7 @@ nfs4_set_delegation(struct nfsd4_open *open, struct nfs4_ol_stateid *stp, if (stp->st_stid.sc_export) dp->dl_stid.sc_export = exp_get(stp->st_stid.sc_export); - fl = nfs4_alloc_init_lease(dp); + fl = nfs4_alloc_init_lease(dp, 0); if (!fl) goto out_clnt_odstate; @@ -9642,12 +9657,11 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate, dp->dl_stid.sc_export = exp_get(cstate->current_fh.fh_export); - fl = nfs4_alloc_init_lease(dp); + fl = nfs4_alloc_init_lease(dp, gdd->gddr_notification[0]); if (!fl) goto out_put_stid; - status = kernel_setlease(nf->nf_file, - fl->c.flc_type, &fl, NULL); + status = kernel_setlease(nf->nf_file, fl->c.flc_type, &fl, NULL); if (fl) locks_free_lease(fl); if (status) -- 2.54.0