diff options
| author | Mark Brown <broonie@kernel.org> | 2025-01-09 11:22:28 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-01-09 11:22:28 +0000 |
| commit | 5640fd07b90ed43225704fecfbbda9d402dba1cf (patch) | |
| tree | 7c9e9e13681499882d3c5d710e37b2f3b088e831 /fs/nfs/pnfs.c | |
| parent | a38509fd5cdc125ef54562760a05c68ebd4812bc (diff) | |
| parent | 9d89551994a430b50c4fffcb1e617a057fa76e20 (diff) | |
spi: Merge up v6.13-rc6
This fixes the i.MX6 and newer Meson platforms in my CI.
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 0d16b383a452..5f582713bf05 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -1308,7 +1308,7 @@ pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo, enum pnfs_iomode *iomode) { /* Serialise LAYOUTGET/LAYOUTRETURN */ - if (atomic_read(&lo->plh_outstanding) != 0) + if (atomic_read(&lo->plh_outstanding) != 0 && lo->plh_return_seq == 0) return false; if (test_and_set_bit(NFS_LAYOUT_RETURN_LOCK, &lo->plh_flags)) return false; |