NFSv4/pNFS: Always allow update of a zero valued layout barrier
Subsystems (2)
[email protected]
maintainerPATCH 1/2 NFSv4/pNFS: Always allow update of a zero valued layout barrier
From: Trond Myklebust <[email protected]>
A zero value for the layout barrier indicates that it has been cleared (since seqid '0' is an illegal value), so we should always allow it to be updated.
Fixes d29b468da4f9 ("pNFS/NFSv4: Improve rejection of out-of-order layouts")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs.c +1 -1
@@ -335,7 +335,7 @@ static bool pnfs_seqid_is_newer(u32 s1, u32 s2)static void pnfs_barrier_update (struct pnfs_layout_hdr *lo,u32 newseq) { -if (pnfs_seqid_is_newer (newseq, lo->plh_barrier)) +if (pnfs_seqid_is_newer (newseq, lo->plh_barrier) || !lo->plh_barrier) lo->plh_barrier = newseq; }
Signature · 1 line
2.31.1
[email protected]
maintainerPATCH 2/2 NFSv4/pnfs: The layout barrier indicate a minimal value for the seqid
From: Trond Myklebust <[email protected]>
The intention of the layout barrier is to ensure that we do not update the layout to match an older value than the current expectation. Fix the test in pnfs_layout_stateid_blocked() to reflect that it is legal for the seqid of the stateid to match that of the barrier.
Fixes aa95edf309ef ("NFSv4/pnfs: Fix the layout barrier update")
Signed-off-by Trond Myklebust <[email protected]>
--- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs.c +1 -1
@@ -1000,7 +1000,7 @@ pnfs_layout_stateid_blocked(const struct pnfs_layout_hdr *lo, {u32 seqid =be32_to_cpu (stateid->seqid); -return !pnfs_seqid_is_newer (seqid, lo->plh_barrier) && lo->plh_barrier; +return lo->plh_barrier &&pnfs_seqid_is_newer (lo->plh_barrier, seqid); }/* lget is set to 1 if called from inside send_layoutget call chain */
Signature · 1 line
2.31.1