@@ -224,7 +224,6 @@ struct svc_rqst {
struct folio_batch rq_fbatch;
struct kvec rq_vec[RPCSVC_MAXPAGES]; /* generally useful.. */
- struct bio_vec rq_bvec[RPCSVC_MAXPAGES];
__be32 rq_xid; /* transmission id */
u32 rq_prog; /* program number */
@@ -40,6 +40,8 @@ struct svc_sock {
struct completion sk_handshake_done;
+ struct bio_vec sk_recv_bvec[RPCSVC_MAXPAGES]
+ ____cacheline_aligned;
struct bio_vec sk_send_bvec[RPCSVC_MAXPAGES]
____cacheline_aligned;
@@ -333,7 +333,7 @@ static ssize_t svc_tcp_read_msg(struct svc_rqst *rqstp, size_t buflen,
{
struct svc_sock *svsk =
container_of(rqstp->rq_xprt, struct svc_sock, sk_xprt);
- struct bio_vec *bvec = rqstp->rq_bvec;
+ struct bio_vec *bvec = svsk->sk_recv_bvec;
struct msghdr msg = { NULL };
unsigned int i;
ssize_t len;