forked from luck/tmp_suning_uos_patched
SUNRPC: Cleanup: remove the unused 'task' argument from the request_send()
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
This commit is contained in:
parent
c544577dad
commit
adfa71446d
|
@ -141,7 +141,7 @@ struct rpc_xprt_ops {
|
|||
void (*connect)(struct rpc_xprt *xprt, struct rpc_task *task);
|
||||
int (*buf_alloc)(struct rpc_task *task);
|
||||
void (*buf_free)(struct rpc_task *task);
|
||||
int (*send_request)(struct rpc_rqst *req, struct rpc_task *task);
|
||||
int (*send_request)(struct rpc_rqst *req);
|
||||
void (*set_retrans_timeout)(struct rpc_task *task);
|
||||
void (*timer)(struct rpc_xprt *xprt, struct rpc_task *task);
|
||||
void (*release_request)(struct rpc_task *task);
|
||||
|
|
|
@ -1283,7 +1283,7 @@ xprt_request_transmit(struct rpc_rqst *req, struct rpc_task *snd_task)
|
|||
req->rq_ntrans++;
|
||||
|
||||
connect_cookie = xprt->connect_cookie;
|
||||
status = xprt->ops->send_request(req, snd_task);
|
||||
status = xprt->ops->send_request(req);
|
||||
trace_xprt_transmit(xprt, req->rq_xid, status);
|
||||
if (status != 0) {
|
||||
req->rq_ntrans--;
|
||||
|
|
|
@ -215,7 +215,7 @@ rpcrdma_bc_send_request(struct svcxprt_rdma *rdma, struct rpc_rqst *rqst)
|
|||
* connection.
|
||||
*/
|
||||
static int
|
||||
xprt_rdma_bc_send_request(struct rpc_rqst *rqst, struct rpc_task *task)
|
||||
xprt_rdma_bc_send_request(struct rpc_rqst *rqst)
|
||||
{
|
||||
struct svc_xprt *sxprt = rqst->rq_xprt->bc_xprt;
|
||||
struct svcxprt_rdma *rdma;
|
||||
|
|
|
@ -693,7 +693,7 @@ xprt_rdma_free(struct rpc_task *task)
|
|||
|
||||
/**
|
||||
* xprt_rdma_send_request - marshal and send an RPC request
|
||||
* @task: RPC task with an RPC message in rq_snd_buf
|
||||
* @rqst: RPC message in rq_snd_buf
|
||||
*
|
||||
* Caller holds the transport's write lock.
|
||||
*
|
||||
|
@ -706,7 +706,7 @@ xprt_rdma_free(struct rpc_task *task)
|
|||
* sent. Do not try to send this message again.
|
||||
*/
|
||||
static int
|
||||
xprt_rdma_send_request(struct rpc_rqst *rqst, struct rpc_task *task)
|
||||
xprt_rdma_send_request(struct rpc_rqst *rqst)
|
||||
{
|
||||
struct rpc_xprt *xprt = rqst->rq_xprt;
|
||||
struct rpcrdma_req *req = rpcr_to_rdmar(rqst);
|
||||
|
|
|
@ -507,7 +507,6 @@ static inline void xs_encode_stream_record_marker(struct xdr_buf *buf)
|
|||
/**
|
||||
* xs_local_send_request - write an RPC request to an AF_LOCAL socket
|
||||
* @req: pointer to RPC request
|
||||
* @task: RPC task that manages the state of an RPC request
|
||||
*
|
||||
* Return values:
|
||||
* 0: The request has been sent
|
||||
|
@ -516,7 +515,7 @@ static inline void xs_encode_stream_record_marker(struct xdr_buf *buf)
|
|||
* ENOTCONN: Caller needs to invoke connect logic then call again
|
||||
* other: Some other error occured, the request was not sent
|
||||
*/
|
||||
static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
||||
static int xs_local_send_request(struct rpc_rqst *req)
|
||||
{
|
||||
struct rpc_xprt *xprt = req->rq_xprt;
|
||||
struct sock_xprt *transport =
|
||||
|
@ -579,7 +578,6 @@ static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
|||
/**
|
||||
* xs_udp_send_request - write an RPC request to a UDP socket
|
||||
* @req: pointer to RPC request
|
||||
* @task: address of RPC task that manages the state of an RPC request
|
||||
*
|
||||
* Return values:
|
||||
* 0: The request has been sent
|
||||
|
@ -588,7 +586,7 @@ static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
|||
* ENOTCONN: Caller needs to invoke connect logic then call again
|
||||
* other: Some other error occurred, the request was not sent
|
||||
*/
|
||||
static int xs_udp_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
||||
static int xs_udp_send_request(struct rpc_rqst *req)
|
||||
{
|
||||
struct rpc_xprt *xprt = req->rq_xprt;
|
||||
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
|
||||
|
@ -656,7 +654,6 @@ static int xs_udp_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
|||
/**
|
||||
* xs_tcp_send_request - write an RPC request to a TCP socket
|
||||
* @req: pointer to RPC request
|
||||
* @task: address of RPC task that manages the state of an RPC request
|
||||
*
|
||||
* Return values:
|
||||
* 0: The request has been sent
|
||||
|
@ -668,7 +665,7 @@ static int xs_udp_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
|||
* XXX: In the case of soft timeouts, should we eventually give up
|
||||
* if sendmsg is not able to make progress?
|
||||
*/
|
||||
static int xs_tcp_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
||||
static int xs_tcp_send_request(struct rpc_rqst *req)
|
||||
{
|
||||
struct rpc_xprt *xprt = req->rq_xprt;
|
||||
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
|
||||
|
@ -2704,7 +2701,7 @@ static int bc_sendto(struct rpc_rqst *req)
|
|||
/*
|
||||
* The send routine. Borrows from svc_send
|
||||
*/
|
||||
static int bc_send_request(struct rpc_rqst *req, struct rpc_task *task)
|
||||
static int bc_send_request(struct rpc_rqst *req)
|
||||
{
|
||||
struct svc_xprt *xprt;
|
||||
int len;
|
||||
|
|
Loading…
Reference in New Issue
Block a user