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

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

nfs/filelayout: use pnfs_error_mark_layout_for_return 



Instead of calling layoutreturn directly, call pnfs_error_mark_layout_for_return
to mark layouts for return and let generic code return layout when
layout segments are freed.

Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTom Haynes <Thomas.Haynes@primarydata.com>

Conflicts:
	fs/nfs/filelayout/filelayout.c
parent e736a5b9

fs/nfs/filelayout/filelayout.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static int filelayout_async_handle_error(struct rpc_task *task, 
		dprintk("%s DS connection error %d\n", __func__,

			task->tk_status);

		nfs4_mark_deviceid_unavailable(devid);

		set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags);

		pnfs_error_mark_layout_for_return(inode, lseg);

		rpc_wake_up(&tbl->slot_tbl_waitq);

		/* fall through */

	default:

fs/nfs/pnfs_nfs.c

+0 −10
Original line number Diff line number Diff line
@@ -18,20 +18,10 @@ 


#define NFSDBG_FACILITY		NFSDBG_PNFS



static void pnfs_generic_fenceme(struct inode *inode,

				 struct pnfs_layout_hdr *lo)

{

	if (!test_and_clear_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))

		return;

	pnfs_return_layout(inode);

}



void pnfs_generic_rw_release(void *data)

{

	struct nfs_pgio_header *hdr = data;

	struct pnfs_layout_hdr *lo = hdr->lseg->pls_layout;



	pnfs_generic_fenceme(lo->plh_inode, lo);

	nfs_put_client(hdr->ds_clp);

	hdr->mds_ops->rpc_release(data);

}