projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
drivers
/
scsi
/
libsas
/
sas_expander.c
diff --git
a/drivers/scsi/libsas/sas_expander.c
b/drivers/scsi/libsas/sas_expander.c
index
55cbd01
..
f42b0e1
100644
(file)
--- a/
drivers/scsi/libsas/sas_expander.c
+++ b/
drivers/scsi/libsas/sas_expander.c
@@
-2163,10
+2163,10
@@
int sas_smp_handler(struct Scsi_Host *shost, struct sas_rphy *rphy,
}
/* do we need to support multiple segments? */
}
/* do we need to support multiple segments? */
- if (
req->bio->bi_vcnt > 1 || rsp->bio->bi_vcnt
> 1) {
+ if (
bio_segments(req->bio) > 1 || bio_segments(rsp->bio)
> 1) {
printk("%s: multiple segments req %u %u, rsp %u %u\n",
printk("%s: multiple segments req %u %u, rsp %u %u\n",
- __func__,
req->bio->bi_vcnt
, blk_rq_bytes(req),
-
rsp->bio->bi_vcnt
, blk_rq_bytes(rsp));
+ __func__,
bio_segments(req->bio)
, blk_rq_bytes(req),
+
bio_segments(rsp->bio)
, blk_rq_bytes(rsp));
return -EINVAL;
}
return -EINVAL;
}