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 BA96B4DC558; Thu, 11 Jun 2026 17:51:08 +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=1781200269; cv=none; b=h6fOHNxMqj00Bqx9x95DWMl2WyH9qQiFaJajDez+lphV69/DKQbKRE5fLNNhksCLIDACetRMQoEATUQ5YsQTDXW8Ogtw+hiR16rw5XAZw5wvGm15p8aPivTXMFujvD9E1MhAyKU4e/EfAiQNObCbU+aq/+Y2D4QNXx8LlMEJhTE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781200269; c=relaxed/simple; bh=yyOVIL3d4lD3gyL9fmIarwsvzMRIwadlBHUUC6PtrTc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dtDeDwIu8UpDZR8/iWpud0bF48yC6/Y+Kj+PeHBwbBR1Puj5+yXjWiT0UQ2BmEoQf1cCwevuhCQqy4mnev6J6ONxW6VUK/zmtwneUrKnGLXm9HYpQB8QlB8SrT4FkQ0iG+H1JoSRvoGjuDLt4i8VduYm5y6yu+YzsNImP/OAJ7I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZNBKPzWu; 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="ZNBKPzWu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B37801F00893; Thu, 11 Jun 2026 17:51:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781200268; bh=i9Q1gDiXGeAiPGNYLXuCsxEZwVYuTaLAvt0x9c5vOJg=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=ZNBKPzWuZKKSn0bHYf9dCXwjeSj/pA/vjsf2eqOOhKiuU1FKYMz9zLM1mgQmwfm/o l152hh4tIVQFehfuwfSFthGYWBJy0bdWdAs4IvU7xPbVW5WFZqyDIkL4g9SNsSBjbK iwn/oHK8tTsbGWecCp+MNmV00WXuz1VtAcnBk2Scj0FaKf60nC+Y1sjnid3ZfATyuE Wcs+llYKHIK81LLJ2f7z72178G7Jbd1eMYt4ptA2Npl64FB2OYVIrvTgkg7LCz+PTA RXoXSafZ0J/6IlEaeAZ7bgRw2ZyoYHg3N/e/2UXOxh2ATtwkkIlyoOiNNmQLVXtM6w 8DguiAeGTwPFA== From: Jeff Layton Date: Thu, 11 Jun 2026 13:50:25 -0400 Subject: [PATCH v6 19/20] nfsd: track requested dir attributes Precedence: bulk X-Mailing-List: linux-kernel@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: <20260611-dir-deleg-v6-19-4c45080e5f3f@kernel.org> References: <20260611-dir-deleg-v6-0-4c45080e5f3f@kernel.org> In-Reply-To: <20260611-dir-deleg-v6-0-4c45080e5f3f@kernel.org> To: NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Trond Myklebust , Anna Schumaker , Jonathan Corbet , Shuah Khan , Chuck Lever 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=3620; i=jlayton@kernel.org; h=from:subject:message-id; bh=yyOVIL3d4lD3gyL9fmIarwsvzMRIwadlBHUUC6PtrTc=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqKvVliER5AbCQzyAurF5kq8TXPJIk3TZua0M2t ZZLDYB5Ot2JAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCair1ZQAKCRAADmhBGVaC Fc8jEACnsnIxuGIx/FKzW5l8UCFfiT/MUzWbzmxwoTGptlzJaeAQEFkXw5Q+SSN02uNAlXy1I7y SWzADgcxjtejR4ewrOr6XZ336Lou+GWQiYdLz9cVgfgPUgUcIObrCmGaAu5ZQbRSm3gopimhCiO 8p8BfGvQpsb4LEuIBHhpKZJqJLixazCffUxPb8wYaX18s4ZjVoGT6KUJZGBqRpwYoXR5U2u9Uby YyIQyguY1P8ZppE2dN/dXI65XyP161V6ySEiQI4RnUb0oj4Tj1d+lByk8XHZAJdWtDEmR5YG4eP AjXjlQJJUD61HiOfHOWjpmqSQmY+ouN6ADUANmHzoEYzjEq9AiWo/XGfK644fcbNVEe+RpqNm5x tzWkzWoaWrOEKOY+L66wFkw9VWCNdC2DSXqIGw4G9FDH5K3krhaSN75rADV4bt3LG7rH5YxbaDv Y4JR5vmYP+9pw+FXtukVzXav+3wBqXxsYiEwFd0by08XD9pF/s9zuPc9n52lD/Kk0zigUjc3oG2 e24Vg0bG1oVBzzOs2Y/ynQKcViTENkkAqA8txUgnxrPFaD0rOzljRE2vOFePa0qNmZtifgtxYD6 WNONdixyTTDjpqKgMggRK4QvZc2javL5Yj+gldbpB7V/bOnW0aKXvTHeVDInNNDYDiZiTXcDMco N7WQq8jIz1F01PA== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Track the union of requested and supported dir attributes in the delegation. In a later patch this will be used to ensure that we only encode the attributes in that union when sending add/remove/rename updates. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4proc.c | 9 ++++++--- fs/nfsd/nfs4state.c | 20 ++++++++++++++++---- fs/nfsd/state.h | 2 ++ 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index caec82e77081..9e86f5907f06 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2530,9 +2530,10 @@ nfsd4_verify(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status == nfserr_same ? nfs_ok : status; } -#define SUPPORTED_NOTIFY_MASK (BIT(NOTIFY4_REMOVE_ENTRY) | \ - BIT(NOTIFY4_ADD_ENTRY) | \ - BIT(NOTIFY4_RENAME_ENTRY) | \ +#define SUPPORTED_NOTIFY_MASK (BIT(NOTIFY4_CHANGE_DIR_ATTRS) | \ + BIT(NOTIFY4_REMOVE_ENTRY) | \ + BIT(NOTIFY4_ADD_ENTRY) | \ + BIT(NOTIFY4_RENAME_ENTRY) | \ BIT(NOTIFY4_GFLAG_EXTEND)) static __be32 @@ -2579,6 +2580,8 @@ nfsd4_get_dir_delegation(struct svc_rqst *rqstp, memcpy(&gdd->gddr_stateid, &dd->dl_stid.sc_stateid, sizeof(gdd->gddr_stateid)); gdd->gddr_child_attributes[0] = dd->dl_child_attrs[0]; gdd->gddr_child_attributes[1] = dd->dl_child_attrs[1]; + gdd->gddr_dir_attributes[0] = dd->dl_dir_attrs[0]; + gdd->gddr_dir_attributes[1] = dd->dl_dir_attrs[1]; nfs4_put_stid(&dd->dl_stid); return nfs_ok; } diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 0e6e008c121e..12627afb604f 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -9945,6 +9945,15 @@ nfsd4_deleg_getattr_conflict(struct svc_rqst *rqstp, struct dentry *dentry, FATTR4_WORD1_TIME_MODIFY | \ FATTR4_WORD1_TIME_CREATE) +#define GDD_WORD0_DIR_ATTRS (FATTR4_WORD0_CHANGE | \ + FATTR4_WORD0_SIZE) + +#define GDD_WORD1_DIR_ATTRS (FATTR4_WORD1_NUMLINKS | \ + FATTR4_WORD1_SPACE_USED | \ + FATTR4_WORD1_TIME_ACCESS | \ + FATTR4_WORD1_TIME_METADATA | \ + FATTR4_WORD1_TIME_MODIFY) + /** * nfsd_get_dir_deleg - attempt to get a directory delegation * @cstate: compound state @@ -10013,14 +10022,17 @@ nfsd_get_dir_deleg(struct nfsd4_compound_state *cstate, dp->dl_stid.sc_export = exp_get(cstate->current_fh.fh_export); - dp->dl_child_attrs[0] = gdd->gdda_child_attributes[0] & GDD_WORD0_CHILD_ATTRS; - dp->dl_child_attrs[1] = gdd->gdda_child_attributes[1] & GDD_WORD1_CHILD_ATTRS; - /* * NB: gddr_notification[0] represents the notifications that * will be granted to the client */ - fl = nfs4_alloc_init_lease(dp, gdd->gddr_notification[0]); + dp->dl_notify_mask = gdd->gddr_notification[0]; + dp->dl_child_attrs[0] = gdd->gdda_child_attributes[0] & GDD_WORD0_CHILD_ATTRS; + dp->dl_child_attrs[1] = gdd->gdda_child_attributes[1] & GDD_WORD1_CHILD_ATTRS; + dp->dl_dir_attrs[0] = gdd->gdda_dir_attributes[0] & GDD_WORD0_DIR_ATTRS; + dp->dl_dir_attrs[1] = gdd->gdda_dir_attributes[1] & GDD_WORD1_DIR_ATTRS; + + fl = nfs4_alloc_init_lease(dp, dp->dl_notify_mask); if (!fl) goto out_put_stid; diff --git a/fs/nfsd/state.h b/fs/nfsd/state.h index 0763893bfd48..17be4011740d 100644 --- a/fs/nfsd/state.h +++ b/fs/nfsd/state.h @@ -299,7 +299,9 @@ struct nfs4_delegation { struct timespec64 dl_ctime; /* For dir delegations */ + uint32_t dl_notify_mask; uint32_t dl_child_attrs[2]; + uint32_t dl_dir_attrs[2]; }; static inline bool deleg_is_read(u32 dl_type) -- 2.54.0