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

Commit aa8a45ee authored by Peng Tao's avatar Peng Tao Committed by Tom Haynes
Browse files

nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET 



Also take care to stop waiting if someone clears retry bit.

Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
parent 012fa16d

fs/nfs/nfs4proc.c

+3 −1
Original line number Diff line number Diff line
@@ -7796,7 +7796,9 @@ static void nfs4_layoutreturn_release(void *calldata) 
	spin_lock(&lo->plh_inode->i_lock);

	if (lrp->res.lrs_present)

		pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);

	clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags);

	clear_bit_unlock(NFS_LAYOUT_RETURN, &lo->plh_flags);

	smp_mb__after_atomic();

	wake_up_bit(&lo->plh_flags, NFS_LAYOUT_RETURN);

	clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags);

	rpc_wake_up(&NFS_SERVER(lo->plh_inode)->roc_rpcwaitq);

	lo->plh_block_lgets--;

fs/nfs/pnfs.c

+38 −1
Original line number Diff line number Diff line
@@ -1398,6 +1398,26 @@ static bool pnfs_within_mdsthreshold(struct nfs_open_context *ctx, 
	return ret;

}



/* stop waiting if someone clears NFS_LAYOUT_RETRY_LAYOUTGET bit. */

static int pnfs_layoutget_retry_bit_wait(struct wait_bit_key *key)

{

	if (!test_bit(NFS_LAYOUT_RETRY_LAYOUTGET, key->flags))

		return 1;

	return nfs_wait_bit_killable(key);

}



static bool pnfs_prepare_to_retry_layoutget(struct pnfs_layout_hdr *lo)

{

	/*

	 * send layoutcommit as it can hold up layoutreturn due to lseg

	 * reference

	 */

	pnfs_layoutcommit_inode(lo->plh_inode, false);

	return !wait_on_bit_action(&lo->plh_flags, NFS_LAYOUT_RETURN,

				   pnfs_layoutget_retry_bit_wait,

				   TASK_UNINTERRUPTIBLE);

}



/*

 * Layout segment is retreived from the server if not cached.

 * The appropriate layout segment is referenced and returned to the caller.
@@ -1444,7 +1464,8 @@ pnfs_update_layout(struct inode *ino, 
	}



	/* if LAYOUTGET already failed once we don't try again */

	if (pnfs_layout_io_test_failed(lo, iomode))

	if (pnfs_layout_io_test_failed(lo, iomode) &&

	    !pnfs_should_retry_layoutget(lo))

		goto out_unlock;



	first = list_empty(&lo->plh_segs);
@@ -1469,6 +1490,22 @@ pnfs_update_layout(struct inode *ino, 
			goto out_unlock;

	}



	/*

	 * Because we free lsegs before sending LAYOUTRETURN, we need to wait

	 * for LAYOUTRETURN even if first is true.

	 */

	if (!lseg && pnfs_should_retry_layoutget(lo) &&

	    test_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) {

		spin_unlock(&ino->i_lock);

		dprintk("%s wait for layoutreturn\n", __func__);

		if (pnfs_prepare_to_retry_layoutget(lo)) {

			pnfs_put_layout_hdr(lo);

			dprintk("%s retrying\n", __func__);

			goto lookup_again;

		}

		goto out_put_layout_hdr;

	}



	if (pnfs_layoutgets_blocked(lo, &arg, 0))

		goto out_unlock;

	atomic_inc(&lo->plh_outstanding);

fs/nfs/pnfs.h

+4 −1
Original line number Diff line number Diff line
@@ -359,8 +359,11 @@ static inline void pnfs_set_retry_layoutget(struct pnfs_layout_hdr *lo) 


static inline void pnfs_clear_retry_layoutget(struct pnfs_layout_hdr *lo)

{

	if (test_and_clear_bit(NFS_LAYOUT_RETRY_LAYOUTGET, &lo->plh_flags))

	if (test_and_clear_bit(NFS_LAYOUT_RETRY_LAYOUTGET, &lo->plh_flags)) {

		atomic_dec(&lo->plh_refcount);

		/* wake up waiters for LAYOUTRETURN as that is not needed */

		wake_up_bit(&lo->plh_flags, NFS_LAYOUT_RETURN);

	}

}



static inline bool pnfs_should_retry_layoutget(struct pnfs_layout_hdr *lo)