From: Peng Tao <tao.peng@xxxxxxxxxxxxxxx>
Otherwise we'll lose error tracking information when
encoding layoutreturn.
Signed-off-by: Peng Tao <tao.peng@xxxxxxxxxxxxxxx>
Signed-off-by: Tom Haynes <loghyr@xxxxxxxxxxxxxxx>
---
fs/nfs/pnfs.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index e123cfc..35465cb 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -355,7 +355,7 @@ pnfs_layout_need_return(struct pnfs_layout_hdr *lo,
return false;
list_for_each_entry(s, &lo->plh_segs, pls_list)
- if (test_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags))
+ if (s != lseg && test_bit(NFS_LSEG_LAYOUTRETURN, &s->pls_flags))
return false;
*stateid = lo->plh_stateid;
@@ -386,15 +386,22 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg)
enum pnfs_iomode iomode;
pnfs_get_layout_hdr(lo);
- pnfs_layout_remove_lseg(lo, lseg);
need_return = pnfs_layout_need_return(lo, lseg,
&stateid, &iomode);
- spin_unlock(&inode->i_lock);
- pnfs_free_lseg(lseg);
- if (need_return)
+ if (need_return) {
+ spin_unlock(&inode->i_lock);
+ /* hdr reference dropped in nfs4_layoutreturn_release */
pnfs_send_layoutreturn(lo, stateid, iomode);
- else
+ spin_lock(&inode->i_lock);
+ pnfs_layout_remove_lseg(lo, lseg);
+ spin_unlock(&inode->i_lock);
+ pnfs_free_lseg(lseg);
+ } else {
+ pnfs_layout_remove_lseg(lo, lseg);
+ spin_unlock(&inode->i_lock);
+ pnfs_free_lseg(lseg);
pnfs_put_layout_hdr(lo);
+ }
}
}
EXPORT_SYMBOL_GPL(pnfs_put_lseg);
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
