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

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

pNFS: Ensure layoutreturn acts as a completion for layout callbacks 



When we return NFS_OK to the CB_LAYOUTRECALL, we are required to
send a layoutreturn that "completes" that layout recall request, using
the correct stateid.

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

fs/nfs/pnfs.c

+25 −15
Original line number Diff line number Diff line
@@ -883,14 +883,30 @@ pnfs_clear_layoutreturn_info(struct pnfs_layout_hdr *lo) 
}



static bool

pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo)

pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo,

		nfs4_stateid *stateid,

		enum pnfs_iomode *iomode)

{

	if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))

		return false;

	pnfs_get_layout_hdr(lo);

	if (test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags)) {

		if (stateid != NULL) {

			nfs4_stateid_copy(stateid, &lo->plh_stateid);

			if (lo->plh_return_seq != 0)

				stateid->seqid = cpu_to_be32(lo->plh_return_seq);

		}

		if (iomode != NULL)

			*iomode = lo->plh_return_iomode;

		pnfs_clear_layoutreturn_info(lo);

		return true;

	}

	if (stateid != NULL)

		nfs4_stateid_copy(stateid, &lo->plh_stateid);

	if (iomode != NULL)

		*iomode = IOMODE_ANY;

	return true;

}



static int

pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, const nfs4_stateid *stateid,
@@ -956,10 +972,7 @@ static void pnfs_layoutreturn_before_put_layout_hdr(struct pnfs_layout_hdr *lo) 
		enum pnfs_iomode iomode;

		bool send;



		nfs4_stateid_copy(&stateid, &lo->plh_stateid);

		stateid.seqid = cpu_to_be32(lo->plh_return_seq);

		iomode = lo->plh_return_iomode;

		send = pnfs_prepare_layoutreturn(lo);

		send = pnfs_prepare_layoutreturn(lo, &stateid, &iomode);

		spin_unlock(&inode->i_lock);

		if (send) {

			/* Send an async layoutreturn so we dont deadlock */
@@ -996,7 +1009,6 @@ _pnfs_return_layout(struct inode *ino) 
		dprintk("NFS: %s no layout to return\n", __func__);

		goto out;

	}

	nfs4_stateid_copy(&stateid, &nfsi->layout->plh_stateid);

	/* Reference matched in nfs4_layoutreturn_release */

	pnfs_get_layout_hdr(lo);

	empty = list_empty(&lo->plh_segs);
@@ -1020,7 +1032,7 @@ _pnfs_return_layout(struct inode *ino) 
	}



	set_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags);

	send = pnfs_prepare_layoutreturn(lo);

	send = pnfs_prepare_layoutreturn(lo, &stateid, NULL);

	spin_unlock(&ino->i_lock);

	pnfs_free_lseg_list(&tmp_list);

	if (send)
@@ -1087,11 +1099,10 @@ bool pnfs_roc(struct inode *ino) 
			goto out_noroc;

	}



	nfs4_stateid_copy(&stateid, &lo->plh_stateid);

	/* always send layoutreturn if being marked so */

	if (test_and_clear_bit(NFS_LAYOUT_RETURN_REQUESTED,

				   &lo->plh_flags))

		layoutreturn = pnfs_prepare_layoutreturn(lo);

	if (test_bit(NFS_LAYOUT_RETURN_REQUESTED, &lo->plh_flags))

		layoutreturn = pnfs_prepare_layoutreturn(lo,

				&stateid, NULL);



	list_for_each_entry_safe(lseg, tmp, &lo->plh_segs, pls_list)

		/* If we are sending layoutreturn, invalidate all valid lsegs */
@@ -1874,10 +1885,9 @@ void pnfs_error_mark_layout_for_return(struct inode *inode, 
	if (!pnfs_mark_matching_lsegs_return(lo, &free_me,

						&range, lseg->pls_seq)) {

		nfs4_stateid stateid;

		enum pnfs_iomode iomode = lo->plh_return_iomode;

		enum pnfs_iomode iomode;



		nfs4_stateid_copy(&stateid, &lo->plh_stateid);

		return_now = pnfs_prepare_layoutreturn(lo);

		return_now = pnfs_prepare_layoutreturn(lo, &stateid, &iomode);

		spin_unlock(&inode->i_lock);

		if (return_now)

			pnfs_send_layoutreturn(lo, &stateid, iomode, false);