Commit 02648908 authored by Chuck Lever's avatar Chuck Lever

SUNRPC: Rename svc_sock::sk_reclen

Clean up. I find the name of the svc_sock::sk_reclen field
confusing, so I've changed it to better reflect its function. This
field is not read directly to get the record length. Rather, it is
a buffer containing a record marker that needs to be decoded.
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent b4af5932
...@@ -28,7 +28,7 @@ struct svc_sock { ...@@ -28,7 +28,7 @@ struct svc_sock {
/* private TCP part */ /* private TCP part */
/* On-the-wire fragment header: */ /* On-the-wire fragment header: */
__be32 sk_reclen; __be32 sk_marker;
/* As we receive a record, this includes the length received so /* As we receive a record, this includes the length received so
* far (including the fragment header): */ * far (including the fragment header): */
u32 sk_tcplen; u32 sk_tcplen;
...@@ -41,12 +41,12 @@ struct svc_sock { ...@@ -41,12 +41,12 @@ struct svc_sock {
static inline u32 svc_sock_reclen(struct svc_sock *svsk) static inline u32 svc_sock_reclen(struct svc_sock *svsk)
{ {
return ntohl(svsk->sk_reclen) & RPC_FRAGMENT_SIZE_MASK; return be32_to_cpu(svsk->sk_marker) & RPC_FRAGMENT_SIZE_MASK;
} }
static inline u32 svc_sock_final_rec(struct svc_sock *svsk) static inline u32 svc_sock_final_rec(struct svc_sock *svsk)
{ {
return ntohl(svsk->sk_reclen) & RPC_LAST_STREAM_FRAGMENT; return be32_to_cpu(svsk->sk_marker) & RPC_LAST_STREAM_FRAGMENT;
} }
/* /*
......
...@@ -841,7 +841,7 @@ static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp) ...@@ -841,7 +841,7 @@ static int svc_tcp_recv_record(struct svc_sock *svsk, struct svc_rqst *rqstp)
struct kvec iov; struct kvec iov;
want = sizeof(rpc_fraghdr) - svsk->sk_tcplen; want = sizeof(rpc_fraghdr) - svsk->sk_tcplen;
iov.iov_base = ((char *) &svsk->sk_reclen) + svsk->sk_tcplen; iov.iov_base = ((char *)&svsk->sk_marker) + svsk->sk_tcplen;
iov.iov_len = want; iov.iov_len = want;
len = svc_recvfrom(rqstp, &iov, 1, want, 0); len = svc_recvfrom(rqstp, &iov, 1, want, 0);
if (len < 0) if (len < 0)
...@@ -938,7 +938,7 @@ static void svc_tcp_fragment_received(struct svc_sock *svsk) ...@@ -938,7 +938,7 @@ static void svc_tcp_fragment_received(struct svc_sock *svsk)
svc_sock_final_rec(svsk) ? "final" : "nonfinal", svc_sock_final_rec(svsk) ? "final" : "nonfinal",
svc_sock_reclen(svsk)); svc_sock_reclen(svsk));
svsk->sk_tcplen = 0; svsk->sk_tcplen = 0;
svsk->sk_reclen = 0; svsk->sk_marker = xdr_zero;
} }
/* /*
...@@ -1154,7 +1154,7 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv) ...@@ -1154,7 +1154,7 @@ static void svc_tcp_init(struct svc_sock *svsk, struct svc_serv *serv)
sk->sk_data_ready = svc_data_ready; sk->sk_data_ready = svc_data_ready;
sk->sk_write_space = svc_write_space; sk->sk_write_space = svc_write_space;
svsk->sk_reclen = 0; svsk->sk_marker = xdr_zero;
svsk->sk_tcplen = 0; svsk->sk_tcplen = 0;
svsk->sk_datalen = 0; svsk->sk_datalen = 0;
memset(&svsk->sk_pages[0], 0, sizeof(svsk->sk_pages)); memset(&svsk->sk_pages[0], 0, sizeof(svsk->sk_pages));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment