OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
epoll: use freezable blocking call
[android-x86/kernel.git]
/
block
/
bio-integrity.c
diff --git
a/block/bio-integrity.c
b/block/bio-integrity.c
index
0984232
..
5cbd5d9
100644
(file)
--- a/
block/bio-integrity.c
+++ b/
block/bio-integrity.c
@@
-216,9
+216,10
@@
static int bio_integrity_process(struct bio *bio,
{
struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
struct blk_integrity_iter iter;
{
struct blk_integrity *bi = bdev_get_integrity(bio->bi_bdev);
struct blk_integrity_iter iter;
- struct bio_vec *bv;
+ struct bvec_iter bviter;
+ struct bio_vec bv;
struct bio_integrity_payload *bip = bio_integrity(bio);
struct bio_integrity_payload *bip = bio_integrity(bio);
- unsigned int
i,
ret = 0;
+ unsigned int ret = 0;
void *prot_buf = page_address(bip->bip_vec->bv_page) +
bip->bip_vec->bv_offset;
void *prot_buf = page_address(bip->bip_vec->bv_page) +
bip->bip_vec->bv_offset;
@@
-227,11
+228,11
@@
static int bio_integrity_process(struct bio *bio,
iter.seed = bip_get_seed(bip);
iter.prot_buf = prot_buf;
iter.seed = bip_get_seed(bip);
iter.prot_buf = prot_buf;
- bio_for_each_segment
_all(bv, bio, i
) {
- void *kaddr = kmap_atomic(bv
->
bv_page);
+ bio_for_each_segment
(bv, bio, bviter
) {
+ void *kaddr = kmap_atomic(bv
.
bv_page);
- iter.data_buf = kaddr + bv
->
bv_offset;
- iter.data_size = bv
->
bv_len;
+ iter.data_buf = kaddr + bv
.
bv_offset;
+ iter.data_size = bv
.
bv_len;
ret = proc_fn(&iter);
if (ret) {
ret = proc_fn(&iter);
if (ret) {