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

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

pNFS: Layoutreturn must invalidate all existing layout segments. 



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

fs/nfs/nfs4proc.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -7964,16 +7964,19 @@ static void nfs4_layoutreturn_release(void *calldata) 
{

{

	struct nfs4_layoutreturn *lrp = calldata;

	struct nfs4_layoutreturn *lrp = calldata;

	struct pnfs_layout_hdr *lo = lrp->args.layout;

	struct pnfs_layout_hdr *lo = lrp->args.layout;

	LIST_HEAD(freeme);





	dprintk("--> %s\n", __func__);

	dprintk("--> %s\n", __func__);

	spin_lock(&lo->plh_inode->i_lock);

	spin_lock(&lo->plh_inode->i_lock);

	if (lrp->res.lrs_present)

	if (lrp->res.lrs_present)

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

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

	pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range);

	pnfs_clear_layoutreturn_waitbit(lo);

	pnfs_clear_layoutreturn_waitbit(lo);

	clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags);

	clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags);

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

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

	lo->plh_block_lgets--;

	lo->plh_block_lgets--;

	spin_unlock(&lo->plh_inode->i_lock);

	spin_unlock(&lo->plh_inode->i_lock);

	pnfs_free_lseg_list(&freeme);

	pnfs_put_layout_hdr(lrp->args.layout);

	pnfs_put_layout_hdr(lrp->args.layout);

	nfs_iput_and_deactive(lrp->inode);

	nfs_iput_and_deactive(lrp->inode);

	kfree(calldata);

	kfree(calldata);