korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-26 13:44:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

RPC: allow call_encode() to delay transmission of an RPC call.

Browse Source 
Currently, call_encode will cause the entire RPC call to abort if it returns
 an error. This is unnecessarily rigid, and gets in the way of attempts
 to allow the NFSv4 layer to order RPC calls that carry sequence ids.

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2005-10-18 14:20:11 -07:00
parent ea635a517e
commit 5e5ce5be6f
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sunrpc/xprt.h
View File

@ -211,6 +211,7 @@ int xprt_reserve_xprt(struct rpc_task *task);
int xprt_reserve_xprt_cong(struct rpc_task *task); int xprt_reserve_xprt_cong(struct rpc_task *task);
int xprt_prepare_transmit(struct rpc_task *task); int xprt_prepare_transmit(struct rpc_task *task);
void xprt_transmit(struct rpc_task *task); void xprt_transmit(struct rpc_task *task);
void xprt_abort_transmit(struct rpc_task *task);
int xprt_adjust_timeout(struct rpc_rqst *req); int xprt_adjust_timeout(struct rpc_rqst *req);
void xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task); void xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task);
void xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task); void xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task);

23
net/sunrpc/clnt.c
View File

@ -678,13 +678,11 @@ call_allocate(struct rpc_task *task)
static void static void
call_encode(struct rpc_task *task) call_encode(struct rpc_task *task)
{ {
struct rpc_clnt *clnt = task->tk_client;
struct rpc_rqst *req = task->tk_rqstp; struct rpc_rqst *req = task->tk_rqstp;
struct xdr_buf *sndbuf = &req->rq_snd_buf; struct xdr_buf *sndbuf = &req->rq_snd_buf;
struct xdr_buf *rcvbuf = &req->rq_rcv_buf; struct xdr_buf *rcvbuf = &req->rq_rcv_buf;
unsigned int bufsiz; unsigned int bufsiz;
kxdrproc_t encode; kxdrproc_t encode;
int status;
u32 *p; u32 *p;
dprintk("RPC: %4d call_encode (status %d)\n", dprintk("RPC: %4d call_encode (status %d)\n",
@ -712,12 +710,9 @@ call_encode(struct rpc_task *task)
rpc_exit(task, -EIO); rpc_exit(task, -EIO);
return; return;
} }
if (encode && (status = rpcauth_wrap_req(task, encode, req, p, if (encode != NULL)
task->tk_msg.rpc_argp)) < 0) { task->tk_status = rpcauth_wrap_req(task, encode, req, p,
printk(KERN_WARNING "%s: can't encode arguments: %d\n", task->tk_msg.rpc_argp);
clnt->cl_protname, -status);
rpc_exit(task, status);
}
} }
/* /*
@ -865,10 +860,12 @@ call_transmit(struct rpc_task *task)
if (task->tk_status != 0) if (task->tk_status != 0)
return; return;
/* Encode here so that rpcsec_gss can use correct sequence number. */ /* Encode here so that rpcsec_gss can use correct sequence number. */
if (!task->tk_rqstp->rq_bytes_sent) if (task->tk_rqstp->rq_bytes_sent == 0) {
call_encode(task); call_encode(task);
if (task->tk_status < 0) /* Did the encode result in an error condition? */
return; if (task->tk_status != 0)
goto out_nosend;
}
xprt_transmit(task); xprt_transmit(task);
if (task->tk_status < 0) if (task->tk_status < 0)
return; return;
@ -876,6 +873,10 @@ call_transmit(struct rpc_task *task)
task->tk_action = NULL; task->tk_action = NULL;
rpc_wake_up_task(task); rpc_wake_up_task(task);
} }
return;
out_nosend:
/* release socket write lock before attempting to handle error */
xprt_abort_transmit(task);
} }
/* /*

8
net/sunrpc/xprt.c
View File

@ -709,6 +709,14 @@ out_unlock:
return err; return err;
} }
void
xprt_abort_transmit(struct rpc_task *task)
{
struct rpc_xprt *xprt = task->tk_xprt;
xprt_release_write(xprt, task);
}
/** /**
* xprt_transmit - send an RPC request on a transport * xprt_transmit - send an RPC request on a transport
* @task: controlling RPC task * @task: controlling RPC task