Re: cleanup block-style layouts exports v2

[Jeff Layton <jlayton@kernel.org>]

On Tue, 2026-04-21 at 14:04 +0200, Christian Brauner wrote:
> On Fri, Apr 17, 2026 at 07:52:20AM -0700, Chuck Lever wrote:
> > 
> > On Wed, Apr 15, 2026, at 7:34 AM, Chuck Lever wrote:
> > > On Tue, Apr 14, 2026, at 10:29 PM, Christoph Hellwig wrote:
> > > > On Tue, Apr 14, 2026 at 12:01:39PM +0200, Christian Brauner wrote:
> > > > > On Fri, Apr 10, 2026 at 01:10:07PM +0200, Christoph Hellwig wrote:
> > > > > > On Thu, Apr 09, 2026 at 03:26:09PM +0200, Christian Brauner wrote:
> > > > > > > > Christian, are you OK if I take this series through the NFSD tree?
> > > > > > > 
> > > > > > > Hm, I generally prefer infrastructure to go through the VFS tree.
> > > > > > > You can get a stable branch ofc.
> > 
> > > In this case, pNFS is the only consumer that will notice or use the
> > > new "infrastructure" and us NFS experts are the only ones who can test
> > > and review it properly. And, the likelihood of conflicts with patches
> > > in nfsd-testing is high (in fact we've already had at least one). It
> > > makes sense to me to take this series through NFSD.
> > 
> > I see that Jeff has posted a series that modifies the fs_notify API surface
> > to support the NFSv4 CB_NOTIFY operation. That likely counts as an
> > infrastructure change.
> > 
> > To meet you halfway, Christian, you could take Christoph's series and
> > Jeff's series into a "vfs.nfsd" tree and I can base my nfsd-next branch
> > on that for the NFSD PR 7.2. Building the NFSD PR on that should avoid
> > merge conflicts with significant changes I have planned.
> 
> Sounds perfect. I don't rebase branches unless there's something really
> really gnarly to handle and I would ping you in advance if anything like
> that were to happen.

Note that there is a small difference (error-handling fix) between the
most-recently posted CB_NOTIFY patchset and what's currently in my
tree. You can either pick or pull the series from my tree, or I can re-
post. Let me know which you'd prefer:

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 5eca7899c48d..bb9093e3933f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1193,8 +1193,8 @@ static void nfs4_free_dir_deleg(struct nfs4_stid *stid)
 
 	for (i = 0; i < ncn->ncn_evt_cnt; ++i)
 		nfsd_notify_event_put(ncn->ncn_evt[i]);
-	release_pages(ncn->ncn_pages, NOTIFY4_PAGE_ARRAY_SIZE);
 	kfree(ncn->ncn_nf);
+	release_pages(ncn->ncn_pages, NOTIFY4_PAGE_ARRAY_SIZE);
 	nfs4_free_deleg(stid);
 }
 
@@ -1213,7 +1213,8 @@ alloc_init_dir_deleg(struct nfs4_client *clp, struct nfs4_file *fp)
 
 	npages = alloc_pages_bulk(GFP_KERNEL, NOTIFY4_PAGE_ARRAY_SIZE, ncn->ncn_pages);
 	if (npages != NOTIFY4_PAGE_ARRAY_SIZE) {
-		nfs4_put_stid(&dp->dl_stid);
+		release_pages(ncn->ncn_pages, npages);
+		nfs4_free_deleg(&dp->dl_stid);
 		return NULL;
 	}