diff options
| author |   Trond Myklebust <trond.myklebust@hammerspace.com> | 2021-07-23 08:57:20 -0400 |
|---|---|---|
| committer |   Anna Schumaker <Anna.Schumaker@Netapp.com> | 2021-08-09 16:57:04 -0400 |
| commit | 45baadaad7bf9183651fb74f4ed1200da48505a5 (patch) | |
| tree | 71c2ff01ba8acafe92f979e672faae5d29832895 /fs/nfs/pnfs.c | |
| parent | NFSv4/pNFS: Remove dead code (diff) | |
| download | linux-dev-45baadaad7bf9183651fb74f4ed1200da48505a5.tar.xz linux-dev-45baadaad7bf9183651fb74f4ed1200da48505a5.zip | |
NFSv4/pNFS: Always allow update of a zero valued layout barrier
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 <trond.myklebust@hammerspace.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 856706180d33..7775f6b5a53a 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -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; } |