Skip to content

Commit adfa714

Browse files
author
Trond Myklebust
committed
SUNRPC: Cleanup: remove the unused 'task' argument from the request_send()
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent c544577 commit adfa714

File tree

5 files changed

+9
-12
lines changed

5 files changed

+9
-12
lines changed

‎include/linux/sunrpc/xprt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ struct rpc_xprt_ops {
141141
void (*connect)(struct rpc_xprt *xprt, struct rpc_task *task);
142142
int (*buf_alloc)(struct rpc_task *task);
143143
void (*buf_free)(struct rpc_task *task);
144-
int (*send_request)(struct rpc_rqst *req, struct rpc_task *task);
144+
int (*send_request)(struct rpc_rqst *req);
145145
void (*set_retrans_timeout)(struct rpc_task *task);
146146
void (*timer)(struct rpc_xprt *xprt, struct rpc_task *task);
147147
void (*release_request)(struct rpc_task *task);

‎net/sunrpc/xprt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1283,7 +1283,7 @@ xprt_request_transmit(struct rpc_rqst *req, struct rpc_task *snd_task)
12831283
req->rq_ntrans++;
12841284

12851285
connect_cookie = xprt->connect_cookie;
1286-
status = xprt->ops->send_request(req, snd_task);
1286+
status = xprt->ops->send_request(req);
12871287
trace_xprt_transmit(xprt, req->rq_xid, status);
12881288
if (status != 0) {
12891289
req->rq_ntrans--;

‎net/sunrpc/xprtrdma/svc_rdma_backchannel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ rpcrdma_bc_send_request(struct svcxprt_rdma *rdma, struct rpc_rqst *rqst)
215215
* connection.
216216
*/
217217
static int
218-
xprt_rdma_bc_send_request(struct rpc_rqst *rqst, struct rpc_task *task)
218+
xprt_rdma_bc_send_request(struct rpc_rqst *rqst)
219219
{
220220
struct svc_xprt *sxprt = rqst->rq_xprt->bc_xprt;
221221
struct svcxprt_rdma *rdma;

‎net/sunrpc/xprtrdma/transport.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ xprt_rdma_free(struct rpc_task *task)
693693

694694
/**
695695
* xprt_rdma_send_request - marshal and send an RPC request
696-
* @task: RPC task with an RPC message in rq_snd_buf
696+
* @rqst: RPC message in rq_snd_buf
697697
*
698698
* Caller holds the transport's write lock.
699699
*
@@ -706,7 +706,7 @@ xprt_rdma_free(struct rpc_task *task)
706706
* sent. Do not try to send this message again.
707707
*/
708708
static int
709-
xprt_rdma_send_request(struct rpc_rqst *rqst, struct rpc_task *task)
709+
xprt_rdma_send_request(struct rpc_rqst *rqst)
710710
{
711711
struct rpc_xprt *xprt = rqst->rq_xprt;
712712
struct rpcrdma_req *req = rpcr_to_rdmar(rqst);

‎net/sunrpc/xprtsock.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,6 @@ static inline void xs_encode_stream_record_marker(struct xdr_buf *buf)
507507
/**
508508
* xs_local_send_request - write an RPC request to an AF_LOCAL socket
509509
* @req: pointer to RPC request
510-
* @task: RPC task that manages the state of an RPC request
511510
*
512511
* Return values:
513512
* 0: The request has been sent
@@ -516,7 +515,7 @@ static inline void xs_encode_stream_record_marker(struct xdr_buf *buf)
516515
* ENOTCONN: Caller needs to invoke connect logic then call again
517516
* other: Some other error occured, the request was not sent
518517
*/
519-
static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
518+
static int xs_local_send_request(struct rpc_rqst *req)
520519
{
521520
struct rpc_xprt *xprt = req->rq_xprt;
522521
struct sock_xprt *transport =
@@ -579,7 +578,6 @@ static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
579578
/**
580579
* xs_udp_send_request - write an RPC request to a UDP socket
581580
* @req: pointer to RPC request
582-
* @task: address of RPC task that manages the state of an RPC request
583581
*
584582
* Return values:
585583
* 0: The request has been sent
@@ -588,7 +586,7 @@ static int xs_local_send_request(struct rpc_rqst *req, struct rpc_task *task)
588586
* ENOTCONN: Caller needs to invoke connect logic then call again
589587
* other: Some other error occurred, the request was not sent
590588
*/
591-
static int xs_udp_send_request(struct rpc_rqst *req, struct rpc_task *task)
589+
static int xs_udp_send_request(struct rpc_rqst *req)
592590
{
593591
struct rpc_xprt *xprt = req->rq_xprt;
594592
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)
656654
/**
657655
* xs_tcp_send_request - write an RPC request to a TCP socket
658656
* @req: pointer to RPC request
659-
* @task: address of RPC task that manages the state of an RPC request
660657
*
661658
* Return values:
662659
* 0: The request has been sent
@@ -668,7 +665,7 @@ static int xs_udp_send_request(struct rpc_rqst *req, struct rpc_task *task)
668665
* XXX: In the case of soft timeouts, should we eventually give up
669666
* if sendmsg is not able to make progress?
670667
*/
671-
static int xs_tcp_send_request(struct rpc_rqst *req, struct rpc_task *task)
668+
static int xs_tcp_send_request(struct rpc_rqst *req)
672669
{
673670
struct rpc_xprt *xprt = req->rq_xprt;
674671
struct sock_xprt *transport = container_of(xprt, struct sock_xprt, xprt);
@@ -2704,7 +2701,7 @@ static int bc_sendto(struct rpc_rqst *req)
27042701
/*
27052702
* The send routine. Borrows from svc_send
27062703
*/
2707-
static int bc_send_request(struct rpc_rqst *req, struct rpc_task *task)
2704+
static int bc_send_request(struct rpc_rqst *req)
27082705
{
27092706
struct svc_xprt *xprt;
27102707
int len;

0 commit comments

Comments
 (0)