diff options
| author | Jeff Layton | 2016-05-17 18:28:39 +0200 |
|---|---|---|
| committer | Anna Schumaker | 2016-05-17 21:48:09 +0200 |
| commit | ee26bdd680aa10df628499fe95a7b88345574248 (patch) | |
| tree | dd2339019779eed74a06419c65dd563ee9359cd9 /fs/nfs | |
| parent | pNFS/flexfiles: When initing reads or writes, we might have to retry connecti... (diff) | |
| download | kernel-qcow2-linux-ee26bdd680aa10df628499fe95a7b88345574248.tar.gz kernel-qcow2-linux-ee26bdd680aa10df628499fe95a7b88345574248.tar.xz kernel-qcow2-linux-ee26bdd680aa10df628499fe95a7b88345574248.zip | |
pnfs: don't merge new ff lsegs with ones that have LAYOUTRETURN bit set
Otherwise, we'll end up returning layouts that we've just received if
the client issues a new LAYOUTGET prior to the LAYOUTRETURN.
Signed-off-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/flexfilelayout/flexfilelayout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 2911ceda8cd9..3bac2094c175 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -299,6 +299,8 @@ ff_lseg_merge(struct pnfs_layout_segment *new, { u64 new_end, old_end; + if (test_bit(NFS_LSEG_LAYOUTRETURN, &old->pls_flags)) + return false; if (new->pls_range.iomode != old->pls_range.iomode) return false; old_end = pnfs_calc_offset_end(old->pls_range.offset, @@ -319,8 +321,6 @@ ff_lseg_merge(struct pnfs_layout_segment *new, new_end); if (test_bit(NFS_LSEG_ROC, &old->pls_flags)) set_bit(NFS_LSEG_ROC, &new->pls_flags); - if (test_bit(NFS_LSEG_LAYOUTRETURN, &old->pls_flags)) - set_bit(NFS_LSEG_LAYOUTRETURN, &new->pls_flags); return true; } |