pNFS/filelayout: fix cheking if a layout is striped
Subsystems (2)
PATCH 1/1 pNFS/filelayout: fix cheking if a layout is striped
A layout can be striped with num_fh = 1. It is perfectly possible that both MDS and DSs can handle the same filehandle, which is exactly the case in vast pnfs layouts. Hence check according to stripe_count > 1, which is the correct check to begin with.
We should not be called with flseg->dsaddr = NULL, but if for some reason we do, return our best guess with is flseg->num_fh > 1.
--- fs/nfs/filelayout/filelayout.c | 2 ++ 1 file changed, 2 insertions(+)
fs/nfs/filelayout/filelayout.c +2 -0
@@ -778,6 +778,8 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid,static bool filelayout_lseg_is_striped (const struct nfs4_filelayout_segment *flseg) { +if (flseg->dsaddr) +return flseg->dsaddr->stripe_count >1 ;return flseg->num_fh >1 ; }
Signature · 1 line
2.43.0
CC Olga
Quoted 27 lines · Sagi Grimberg
A layout can be striped with
num_fh= 1. It is perfectly possible that both MDS and DSs can handle the same filehandle, which is exactly the case in vast pnfs layouts. Hence check according tostripe_count> 1, which is the correct check to begin with.We should not be called with
flseg->dsaddr= NULL, but if for some reason we do, return our best guess with isflseg->num_fh> 1.Fixes a6b9d2fa0024 ("pNFS/filelayout: Fix coalescing test for single DS")Signed-off-by Sagi Grimberg <[email protected]>--- fs/nfs/filelayout/filelayout.c | 2 ++ 1 file changed, 2 insertions(+)fs/nfs/filelayout/filelayout.c +2
-0@@ -778,6 +778,8 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid,static bool filelayout_lseg_is_striped (const struct nfs4_filelayout_segment *flseg) { +if (flseg->dsaddr) +return flseg->dsaddr->stripe_count >1 ;return flseg->num_fh >1 ; }