| Message ID | 20230130092157.1759539-22-hch@lst.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [01/23] block: factor out a bvec_set_page helper | expand |
> On Jan 30, 2023, at 4:21 AM, Christoph Hellwig <hch@lst.de> wrote: > > Use the bvec_set_page helper to initialize bvecs. > > Signed-off-by: Christoph Hellwig <hch@lst.de> Acked-by: Chuck Lever <chuck.lever@oracle.com> > --- > net/sunrpc/svcsock.c | 7 ++----- > net/sunrpc/xdr.c | 5 ++--- > 2 files changed, 4 insertions(+), 8 deletions(-) > > diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c > index 815baf308236a9..91252adcae4696 100644 > --- a/net/sunrpc/svcsock.c > +++ b/net/sunrpc/svcsock.c > @@ -252,11 +252,8 @@ static ssize_t svc_tcp_read_msg(struct svc_rqst *rqstp, size_t buflen, > > clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); > > - for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) { > - bvec[i].bv_page = rqstp->rq_pages[i]; > - bvec[i].bv_len = PAGE_SIZE; > - bvec[i].bv_offset = 0; > - } > + for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) > + bvec_set_page(&bvec[i], rqstp->rq_pages[i], PAGE_SIZE, 0); > rqstp->rq_respages = &rqstp->rq_pages[i]; > rqstp->rq_next_page = rqstp->rq_respages + 1; > > diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c > index f7767bf224069f..afe7ec02d23229 100644 > --- a/net/sunrpc/xdr.c > +++ b/net/sunrpc/xdr.c > @@ -150,9 +150,8 @@ xdr_alloc_bvec(struct xdr_buf *buf, gfp_t gfp) > if (!buf->bvec) > return -ENOMEM; > for (i = 0; i < n; i++) { > - buf->bvec[i].bv_page = buf->pages[i]; > - buf->bvec[i].bv_len = PAGE_SIZE; > - buf->bvec[i].bv_offset = 0; > + bvec_set_page(&buf->bvec[i], buf->pages[i], PAGE_SIZE, > + 0); > } > } > return 0; > -- > 2.39.0 > -- Chuck Lever
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 815baf308236a9..91252adcae4696 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@ -252,11 +252,8 @@ static ssize_t svc_tcp_read_msg(struct svc_rqst *rqstp, size_t buflen, clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); - for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) { - bvec[i].bv_page = rqstp->rq_pages[i]; - bvec[i].bv_len = PAGE_SIZE; - bvec[i].bv_offset = 0; - } + for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) + bvec_set_page(&bvec[i], rqstp->rq_pages[i], PAGE_SIZE, 0); rqstp->rq_respages = &rqstp->rq_pages[i]; rqstp->rq_next_page = rqstp->rq_respages + 1; diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c index f7767bf224069f..afe7ec02d23229 100644 --- a/net/sunrpc/xdr.c +++ b/net/sunrpc/xdr.c @@ -150,9 +150,8 @@ xdr_alloc_bvec(struct xdr_buf *buf, gfp_t gfp) if (!buf->bvec) return -ENOMEM; for (i = 0; i < n; i++) { - buf->bvec[i].bv_page = buf->pages[i]; - buf->bvec[i].bv_len = PAGE_SIZE; - buf->bvec[i].bv_offset = 0; + bvec_set_page(&buf->bvec[i], buf->pages[i], PAGE_SIZE, + 0); } } return 0;
Use the bvec_set_page helper to initialize bvecs. Signed-off-by: Christoph Hellwig <hch@lst.de> --- net/sunrpc/svcsock.c | 7 ++----- net/sunrpc/xdr.c | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-)