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

NFS: Get rid of nfs_restart_rpc() 



It can trivially be replaced with rpc_restart_call_prepare.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent b8ef7063

fs/nfs/internal.h

+0 −10
Original line number Diff line number Diff line
@@ -457,13 +457,3 @@ unsigned int nfs_page_array_len(unsigned int base, size_t len) 
		PAGE_SIZE - 1) >> PAGE_SHIFT;

}

/*

 * Helper for restarting RPC calls in the possible presence of NFSv4.1

 * sessions.

 */

static inline int nfs_restart_rpc(struct rpc_task *task, const struct nfs_client *clp)

{

	if (nfs4_has_session(clp))

		return rpc_restart_call_prepare(task);

	return rpc_restart_call(task);

}

fs/nfs/nfs4filelayout.c

+4 −10
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ static int filelayout_async_handle_error(struct rpc_task *task, 
static int filelayout_read_done_cb(struct rpc_task *task,

				struct nfs_read_data *data)

{

	struct nfs_client *clp = data->ds_clp;

	int reset = 0;



	dprintk("%s DS read\n", __func__);
@@ -134,9 +133,8 @@ static int filelayout_read_done_cb(struct rpc_task *task, 
		if (reset) {

			pnfs_set_lo_fail(data->lseg);

			nfs4_reset_read(task, data);

			clp = NFS_SERVER(data->inode)->nfs_client;

		}

		nfs_restart_rpc(task, clp);

		rpc_restart_call_prepare(task);

		return -EAGAIN;

	}
@@ -203,17 +201,13 @@ static int filelayout_write_done_cb(struct rpc_task *task, 


	if (filelayout_async_handle_error(task, data->args.context->state,

					  data->ds_clp, &reset) == -EAGAIN) {

		struct nfs_client *clp;



		dprintk("%s calling restart ds_clp %p ds_clp->cl_session %p\n",

			__func__, data->ds_clp, data->ds_clp->cl_session);

		if (reset) {

			pnfs_set_lo_fail(data->lseg);

			nfs4_reset_write(task, data);

			clp = NFS_SERVER(data->inode)->nfs_client;

		} else

			clp = data->ds_clp;

		nfs_restart_rpc(task, clp);

		}

		rpc_restart_call_prepare(task);

		return -EAGAIN;

	}
@@ -245,7 +239,7 @@ static int filelayout_commit_done_cb(struct rpc_task *task, 
			prepare_to_resend_writes(data);

			pnfs_set_lo_fail(data->lseg);

		} else

			nfs_restart_rpc(task, data->ds_clp);

			rpc_restart_call_prepare(task);

		return -EAGAIN;

	}

fs/nfs/nfs4proc.c

+8 −9
Original line number Diff line number Diff line
@@ -3191,7 +3191,7 @@ static int nfs4_read_done_cb(struct rpc_task *task, struct nfs_read_data *data) 
	struct nfs_server *server = NFS_SERVER(data->inode);



	if (nfs4_async_handle_error(task, server, data->args.context->state) == -EAGAIN) {

		nfs_restart_rpc(task, server->nfs_client);

		rpc_restart_call_prepare(task);

		return -EAGAIN;

	}
@@ -3241,7 +3241,7 @@ static int nfs4_write_done_cb(struct rpc_task *task, struct nfs_write_data *data 
	struct inode *inode = data->inode;

	

	if (nfs4_async_handle_error(task, NFS_SERVER(inode), data->args.context->state) == -EAGAIN) {

		nfs_restart_rpc(task, NFS_SERVER(inode)->nfs_client);

		rpc_restart_call_prepare(task);

		return -EAGAIN;

	}

	if (task->tk_status >= 0) {
@@ -3298,7 +3298,7 @@ static int nfs4_commit_done_cb(struct rpc_task *task, struct nfs_write_data *dat 
	struct inode *inode = data->inode;



	if (nfs4_async_handle_error(task, NFS_SERVER(inode), NULL) == -EAGAIN) {

		nfs_restart_rpc(task, NFS_SERVER(inode)->nfs_client);

		rpc_restart_call_prepare(task);

		return -EAGAIN;

	}

	nfs_refresh_inode(inode, data->res.fattr);
@@ -3838,7 +3838,7 @@ static void nfs4_delegreturn_done(struct rpc_task *task, void *calldata) 
	default:

		if (nfs4_async_handle_error(task, data->res.server, NULL) ==

				-EAGAIN) {

			nfs_restart_rpc(task, data->res.server->nfs_client);

			rpc_restart_call_prepare(task);

			return;

		}

	}
@@ -4092,8 +4092,7 @@ static void nfs4_locku_done(struct rpc_task *task, void *data) 
			break;

		default:

			if (nfs4_async_handle_error(task, calldata->server, NULL) == -EAGAIN)

				nfs_restart_rpc(task,

						 calldata->server->nfs_client);

				rpc_restart_call_prepare(task);

	}

}
@@ -4926,7 +4925,7 @@ static void nfs4_get_lease_time_done(struct rpc_task *task, void *calldata) 
		task->tk_status = 0;

		/* fall through */

	case -NFS4ERR_RETRY_UNCACHED_REP:

		nfs_restart_rpc(task, data->clp);

		rpc_restart_call_prepare(task);

		return;

	}

	dprintk("<-- %s\n", __func__);
@@ -5767,7 +5766,7 @@ static void nfs4_layoutreturn_done(struct rpc_task *task, void *calldata) 


	server = NFS_SERVER(lrp->args.inode);

	if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN) {

		nfs_restart_rpc(task, lrp->clp);

		rpc_restart_call_prepare(task);

		return;

	}

	spin_lock(&lo->plh_inode->i_lock);
@@ -5938,7 +5937,7 @@ nfs4_layoutcommit_done(struct rpc_task *task, void *calldata) 
	}



	if (nfs4_async_handle_error(task, server, NULL) == -EAGAIN) {

		nfs_restart_rpc(task, server->nfs_client);

		rpc_restart_call_prepare(task);

		return;

	}

fs/nfs/read.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static void nfs_readpage_retry(struct rpc_task *task, struct nfs_read_data *data 
	argp->offset += resp->count;

	argp->pgbase += resp->count;

	argp->count -= resp->count;

	nfs_restart_rpc(task, NFS_SERVER(data->inode)->nfs_client);

	rpc_restart_call_prepare(task);

}



/*

fs/nfs/unlink.c

+2 −2
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata) 
	struct inode *dir = data->dir;



	if (!NFS_PROTO(dir)->unlink_done(task, dir))

		nfs_restart_rpc(task, NFS_SERVER(dir)->nfs_client);

		rpc_restart_call_prepare(task);

}



/**
@@ -369,7 +369,7 @@ static void nfs_async_rename_done(struct rpc_task *task, void *calldata) 
	struct dentry *new_dentry = data->new_dentry;



	if (!NFS_PROTO(old_dir)->rename_done(task, old_dir, new_dir)) {

		nfs_restart_rpc(task, NFS_SERVER(old_dir)->nfs_client);

		rpc_restart_call_prepare(task);

		return;

	}