diff options
| author | Chunwei Chen <[email protected]> | 2014-03-29 20:26:17 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2014-04-10 14:28:51 -0700 |
| commit | b761912b3473f09a642eea21d609ce9bc1c91546 (patch) | |
| tree | 7ddeae7c8957961dab2175308f3dc65f6cb0b5f8 /module/zfs | |
| parent | 22760eebeff0e0ad826132b1be1113eecb39938a (diff) | |
Linux 3.14 compat: rq_for_each_segment in dmu_req_copy
rq_for_each_segment changed from taking bio_vec * to taking bio_vec.
We provide rq_for_each_segment4 which takes both.
Signed-off-by: Chunwei Chen <[email protected]>
Signed-off-by: Richard Yao <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Issue #2124
Diffstat (limited to 'module/zfs')
| -rw-r--r-- | module/zfs/dmu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c index 5d9337f65..edad9b496 100644 --- a/module/zfs/dmu.c +++ b/module/zfs/dmu.c @@ -1011,13 +1011,13 @@ xuio_stat_wbuf_nocopy() static int dmu_req_copy(void *arg_buf, int size, struct request *req, size_t req_offset) { - struct bio_vec *bv; + struct bio_vec bv, *bvp; struct req_iterator iter; char *bv_buf; int tocpy, bv_len, bv_offset; int offset = 0; - rq_for_each_segment(bv, req, iter) { + rq_for_each_segment4(bv, bvp, req, iter) { /* * Fully consumed the passed arg_buf. We use goto here because * rq_for_each_segment is a double loop @@ -1027,19 +1027,19 @@ dmu_req_copy(void *arg_buf, int size, struct request *req, size_t req_offset) goto out; /* Skip already copied bv */ - if (req_offset >= bv->bv_len) { - req_offset -= bv->bv_len; + if (req_offset >= bv.bv_len) { + req_offset -= bv.bv_len; continue; } - bv_len = bv->bv_len - req_offset; - bv_offset = bv->bv_offset + req_offset; + bv_len = bv.bv_len - req_offset; + bv_offset = bv.bv_offset + req_offset; req_offset = 0; tocpy = MIN(bv_len, size - offset); ASSERT3S(tocpy, >=, 0); - bv_buf = page_address(bv->bv_page) + bv_offset; + bv_buf = page_address(bv.bv_page) + bv_offset; ASSERT3P(bv_buf, !=, NULL); if (rq_data_dir(req) == WRITE) |