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 CC26C383C9E; Fri, 22 May 2026 19:43:05 +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=1779478991; cv=none; b=SlIQ8Enlt9EYN0y9oMoXU7WWCeNiChdm2GGHkLktES/TQVrm70eV/tM2jizXifSWXk6n25eEstpyuWpxImoyfE/OzdPk9DcsekKed6dlNYblt+AZGAuA5amZH+XYjWMcLKBobAGg9P5ze94rtKB0V3xNH0YtR7N5wrf8NE3LIOw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779478991; c=relaxed/simple; bh=Y50oSV6B/JehwRBE6ozp3wxwE6QnIRaFrxKuDBSJhao=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jRlaMW3YVBvjsNSQRyuaXCrvYxo46N5TcRxJMrNjWxZ6Uu0vL9fxcPI954wUMsxDj7QVGji8m4CNUhxtFfqXIoSudeKNCJaQWq8dKz7nhcL6sAtdQd5lC8GE5FhNiQYpZOXqGspDCwowL6Xf4XbjTDQFTVdwgzO+rXr2zItwoLM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CZzFPWr7; 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="CZzFPWr7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 43C8F1F00ADE; Fri, 22 May 2026 19:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779478985; bh=SNn+vri9RRR9gMRxnX7erNj8H9djqSG4aGq8GD9k76c=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=CZzFPWr7Lr58yG3gkaYoK8eH4kIKTi3mqmAalxEcoAy21k2VXC6l5s6iI9//wMk4N NxjfmDCvRFrfCz1jGNlEyxIrR1nR64Q1pPQr0C02YZuw+qAK12VEHQPzw8mMfizHf1 OBEOaHBbOye9uVEUSA4voO1oMIZXZ3iHQmaCIH7yUVzAqAC1FBn8DKfSc2Pkf1II7F 1TnuIKom0gnH7UlIEdcOcNcII7os//VP2O2SbGdfBy04hGdakliq5cWLR+MQAT6iSl 8TY54opW13qkBNdrUjLNPSrUxDlx+jAsJTRlVdw7cd14ZqEKhMfORBCttKufE5x346 kbakm9ZvIMmsA== From: Jeff Layton Date: Fri, 22 May 2026 15:42:23 -0400 Subject: [PATCH v5 18/21] nfsd: add the filehandle to returned attributes in CB_NOTIFY 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-18-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=2618; i=jlayton@kernel.org; h=from:subject:message-id; bh=Y50oSV6B/JehwRBE6ozp3wxwE6QnIRaFrxKuDBSJhao=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBqELGidRP4f2Dl0NdDmEbDbDRxOvVM/cm1wWYBG aRGlFTddbmJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCahCxogAKCRAADmhBGVaC FfpiD/0ai7GIttvby6Dhm4WScYzubfwm2RUzauT+o2CVq0JxS8i6c/XgL/Yrod7lvl9RVcr2MUO oX53wA1u3Y3duCXZHaaGPmVBxYnPzXjXIX2/ShiHYokNDpEqDi4SrE0v9DFZwwEaX4IBc7IeXgR Z3ylWlKLpc6MzR5Y9mvlEs7kn7agcpCYDEm2rq+F6S87UjAY8X/dp0iEasHD2aLYaU0Ukq8gdXi 1IReD7HHAXOt3ZiqFLHqNmYMKBVt2pD7pxzNe/rG9Cd0jiiORMGroPLAJJTdOEFpUWWTpb8/+h5 qGMDD2clb1tvN8k1tPM9EXVCG6upsu1Caa+cn5fEne/wanDccHR6olLs8fOTKAW+pxyTNalXvTX NlN4Naq/gqZO9yh/r6N8AQa8JkEiPuyubqM5dYOZOpez9SxV94VQsBazUdcVsd2LV0JKxmYyYAN Fh35mrL2jsb5dogEVBQ1fo95ONMrVTSWDr/JX2mWjpqG3TLlfmKdm7/3Qd8l0gkG5uuN+CoUc1q QMABC08ZRl+XaCeH9dDj+wUgM9XUKq9pNWdsz1r+IaDrbJrTuEScGibqG54uzdQPJ8TCr+mPgqz i5khrCNf48V7YVV7qS7m3k9atLje+6kvZ8mlAnl2imgEoly//ZHKuOpI5Sj1tjNn6Qcchpzh9cO By1gayr6w/m39cw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 nfsd's usual fh_compose routine requires a svc_export and fills out a svc_fh. In the context of a CB_NOTIFY there is no such export to consult. Add a new routine that composes a filehandle with only a parent filehandle and nfs4_file. Use that to fill out the fhandle field in the nfsd4_fattr_args. Signed-off-by: Jeff Layton --- fs/nfsd/nfs4xdr.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 33b6cd492e56..f8534288b2fc 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4184,6 +4184,39 @@ nfsd4_encode_fattr4(struct svc_rqst *rqstp, struct xdr_stream *xdr, goto out; } +static bool +setup_notify_fhandle(struct dentry *dentry, struct nfs4_file *fi, + struct nfsd_file *nf, struct nfsd4_fattr_args *args) +{ + int fileid_type, fsid_len, maxsize, flags = 0; + struct knfsd_fh *fhp = &args->fhandle; + struct inode *inode = d_inode(dentry); + struct inode *parent = NULL; + struct fid *fid; + + fsid_len = key_len(fi->fi_fhandle.fh_fsid_type); + fhp->fh_size = 4 + fsid_len; + + /* Copy first 4 bytes + fsid */ + memcpy(&fhp->fh_raw, &fi->fi_fhandle.fh_raw, fhp->fh_size); + + fid = (struct fid *)(fh_fsid(fhp) + fsid_len/4); + maxsize = (NFS4_FHSIZE - fhp->fh_size)/4; + + if (fi->fi_connectable && !S_ISDIR(inode->i_mode)) { + parent = d_inode(nf->nf_file->f_path.dentry); + flags = EXPORT_FH_CONNECTABLE; + } + + fileid_type = exportfs_encode_inode_fh(inode, fid, &maxsize, parent, flags); + if (fileid_type < 0) + return false; + + fhp->fh_fileid_type = fileid_type; + fhp->fh_size += maxsize * 4; + return true; +} + #define CB_NOTIFY_STATX_REQUEST_MASK (STATX_BASIC_STATS | \ STATX_BTIME | \ STATX_CHANGE_COOKIE) @@ -4193,6 +4226,7 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, struct xdr_stream *xdr, struct dentry *dentry, struct nfs4_delegation *dp, struct nfsd_file *nf, char *name, u32 namelen) { + struct nfs4_file *fi = dp->dl_stid.sc_file; struct path path = { .mnt = nf->nf_file->f_path.mnt, .dentry = dentry }; struct nfsd4_fattr_args args = { }; @@ -4231,6 +4265,9 @@ nfsd4_setup_notify_entry4(struct notify_entry4 *ne, struct xdr_stream *xdr, FATTR4_WORD1_TIME_METADATA | FATTR4_WORD1_TIME_MODIFY; attrmask[2] = 0; + if (setup_notify_fhandle(dentry, fi, nf, &args)) + attrmask[0] |= FATTR4_WORD0_FILEHANDLE; + if (args.stat.result_mask & STATX_BTIME) attrmask[1] |= FATTR4_WORD1_TIME_CREATE; -- 2.54.0