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

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

Revert "NFSv4/flexfiles: Abort I/O early if the layout segment was invalidated" 



This reverts commit a79f194a.
The mechanism for aborting I/O is racy, since we are not guaranteed that
the request is asleep while we're changing both task->tk_status and
task->tk_action.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
Cc: stable@vger.kernel.org # v5.1
parent 80f455da

fs/nfs/flexfilelayout/flexfilelayout.c

+0 −17
Original line number Diff line number Diff line
@@ -1148,8 +1148,6 @@ static int ff_layout_async_handle_error_v4(struct rpc_task *task, 
		break;

	case -NFS4ERR_RETRY_UNCACHED_REP:

		break;

	case -EAGAIN:

		return -NFS4ERR_RESET_TO_PNFS;

	/* Invalidate Layout errors */

	case -NFS4ERR_PNFS_NO_LAYOUT:

	case -ESTALE:           /* mapped NFS4ERR_STALE */
@@ -1210,7 +1208,6 @@ static int ff_layout_async_handle_error_v3(struct rpc_task *task, 
	case -EBADHANDLE:

	case -ELOOP:

	case -ENOSPC:

	case -EAGAIN:

		break;

	case -EJUKEBOX:

		nfs_inc_stats(lseg->pls_layout->plh_inode, NFSIOS_DELAY);
@@ -1445,16 +1442,6 @@ static void ff_layout_read_prepare_v4(struct rpc_task *task, void *data) 
	ff_layout_read_prepare_common(task, hdr);

}



static void

ff_layout_io_prepare_transmit(struct rpc_task *task,

		void *data)

{

	struct nfs_pgio_header *hdr = data;



	if (!pnfs_is_valid_lseg(hdr->lseg))

		rpc_exit(task, -EAGAIN);

}



static void ff_layout_read_call_done(struct rpc_task *task, void *data)

{

	struct nfs_pgio_header *hdr = data;
@@ -1740,7 +1727,6 @@ static void ff_layout_commit_release(void *data) 


static const struct rpc_call_ops ff_layout_read_call_ops_v3 = {

	.rpc_call_prepare = ff_layout_read_prepare_v3,

	.rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,

	.rpc_call_done = ff_layout_read_call_done,

	.rpc_count_stats = ff_layout_read_count_stats,

	.rpc_release = ff_layout_read_release,
@@ -1748,7 +1734,6 @@ static const struct rpc_call_ops ff_layout_read_call_ops_v3 = { 


static const struct rpc_call_ops ff_layout_read_call_ops_v4 = {

	.rpc_call_prepare = ff_layout_read_prepare_v4,

	.rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,

	.rpc_call_done = ff_layout_read_call_done,

	.rpc_count_stats = ff_layout_read_count_stats,

	.rpc_release = ff_layout_read_release,
@@ -1756,7 +1741,6 @@ static const struct rpc_call_ops ff_layout_read_call_ops_v4 = { 


static const struct rpc_call_ops ff_layout_write_call_ops_v3 = {

	.rpc_call_prepare = ff_layout_write_prepare_v3,

	.rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,

	.rpc_call_done = ff_layout_write_call_done,

	.rpc_count_stats = ff_layout_write_count_stats,

	.rpc_release = ff_layout_write_release,
@@ -1764,7 +1748,6 @@ static const struct rpc_call_ops ff_layout_write_call_ops_v3 = { 


static const struct rpc_call_ops ff_layout_write_call_ops_v4 = {

	.rpc_call_prepare = ff_layout_write_prepare_v4,

	.rpc_call_prepare_transmit = ff_layout_io_prepare_transmit,

	.rpc_call_done = ff_layout_write_call_done,

	.rpc_count_stats = ff_layout_write_count_stats,

	.rpc_release = ff_layout_write_release,

include/linux/sunrpc/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ typedef void (*rpc_action)(struct rpc_task *); 


struct rpc_call_ops {

	void (*rpc_call_prepare)(struct rpc_task *, void *);

	void (*rpc_call_prepare_transmit)(struct rpc_task *, void *);

	void (*rpc_call_done)(struct rpc_task *, void *);

	void (*rpc_count_stats)(struct rpc_task *, void *);

	void (*rpc_release)(void *);

net/sunrpc/xprt.c

+0 −7
Original line number Diff line number Diff line
@@ -1408,13 +1408,6 @@ xprt_request_transmit(struct rpc_rqst *req, struct rpc_task *snd_task) 
			status = -EBADMSG;

			goto out_dequeue;

		}

		if (task->tk_ops->rpc_call_prepare_transmit) {

			task->tk_ops->rpc_call_prepare_transmit(task,

					task->tk_calldata);

			status = task->tk_status;

			if (status < 0)

				goto out_dequeue;

		}

		if (RPC_SIGNALLED(task)) {

			status = -ERESTARTSYS;

			goto out_dequeue;