Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdc59cf2 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: pnfs_roc_drain() fix a race with open 



If a process reopens the file before we can send off the CLOSE/DELEGRETURN,
then pnfs_roc_drain() may end up waiting for a new set of layout segments
that are marked as return-on-close, but haven't yet been returned.

Fix this by only waiting for those layout segments that were invalidated in
pnfs_roc().

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 7f27392c

fs/nfs/pnfs.c

+9 −6
Original line number Diff line number Diff line
@@ -1159,8 +1159,11 @@ bool pnfs_roc_drain(struct inode *ino, u32 *barrier, struct rpc_task *task) 
	bool layoutreturn = false;



	spin_lock(&ino->i_lock);

	list_for_each_entry(lseg, &nfsi->layout->plh_segs, pls_list)

		if (test_bit(NFS_LSEG_ROC, &lseg->pls_flags)) {

	list_for_each_entry(lseg, &nfsi->layout->plh_segs, pls_list) {

		if (!test_bit(NFS_LSEG_ROC, &lseg->pls_flags))

			continue;

		if (test_bit(NFS_LSEG_VALID, &lseg->pls_flags))

			continue;

		rpc_sleep_on(&NFS_SERVER(ino)->roc_rpcwaitq, task, NULL);

		spin_unlock(&ino->i_lock);

		return true;