Skip to contentSkip to conversation

nfsd: fix handling of NFSEXP_PNFS in the netlink codepath

PATCH In review Jeff Layton 3 participants 3 messages Apr 14 – Apr 15

Subsystems (2)
lore
Share & tools
lore

Jeff Layton

author maintainer
#0 lore raw

PATCH 1/1 nfsd: fix handling of NFSEXP_PNFS in the netlink codepath

The rework of how block layouts were checked moved the check for NFSEXP_PNFS out of nfsd4_setup_layout_type() and into the callers. That patch didn't account for the new call in nfsd4_setup_layout_type().

Cc Christoph Hellwig <[email protected]>
Fixes f85460b2aa22 ("exportfs,nfsd: rework checking for layout-based block device access support")

---
This patch needs to go into Chuck's nfsd-testing branch, ideally folded into the patch in the Fixes: line. Otherwise, pnfs is enabled on every xfs export discovered via netlink.

---
 fs/nfsd/export.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/nfsd/export.c +2 -1
index e6a250576048..f562d383439b 100644
@@ -1017,7 +1017,8 @@ static int nfsd_nl_parse_one_export(struct cache_detail *cd,
 			goto out_uuid;
 		err = 0;
 
-		nfsd4_setup_layout_type(&exp);
+		if (exp.ex_flags & NFSEXP_PNFS)
+			nfsd4_setup_layout_type(&exp);
 	}
 
 	expp = svc_export_lookup(&exp);

---
base-commit: b858b275543b35cb0fc2bf863da017de92ef192b
change-id: 20260414-pnfs-exp-fix-b1eb96d05634

Best regards,

Signature · 1 line
Jeff Layton <[email protected]>
maintainer
#1 lore raw

From: Chuck Lever <[email protected]>

Quoted 5 lines · Jeff Layton

The rework of how block layouts were checked moved the check for NFSEXP_PNFS out of nfsd4_setup_layout_type() and into the callers. That patch didn't account for the new call in nfsd4_setup_layout_type().

Applied to nfsd-testing, thanks!

For the moment Christoph's series is still in my tree.

[1/1] nfsd: fix handling of NFSEXP_PNFS in the netlink codepath

      commit: b8cefe5d302f351c252a833dd8c7e8f4a0cd5028

--
Chuck Lever <[email protected]>