aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorBoaz Harrosh <bharrosh@panasas.com>2009-05-24 13:04:43 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-06-10 10:00:13 -0400
commitfc2fac5b5f11e2bee3bf37215c8746236f5ea188 (patch)
tree1a76933892cd58d820558aa70a853fb590935e7d /drivers/scsi
parent62f469b596dd0aadf046a69027087c18db43734e (diff)
[SCSI] libosd: Define an osd_dev wrapper to retrieve the request_queue
libosd users that need to work with bios, must sometime use the request_queue associated with the osd_dev. Make a wrapper for that, and convert all in-tree users. Signed-off-by: Boaz Harrosh <bharrosh@panasas.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/osd/osd_initiator.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c
index 3f5ec578e6c6..3959797149fd 100644
--- a/drivers/scsi/osd/osd_initiator.c
+++ b/drivers/scsi/osd/osd_initiator.c
@@ -670,7 +670,7 @@ static int _osd_req_list_objects(struct osd_request *or,
670 __be16 action, const struct osd_obj_id *obj, osd_id initial_id, 670 __be16 action, const struct osd_obj_id *obj, osd_id initial_id,
671 struct osd_obj_id_list *list, unsigned nelem) 671 struct osd_obj_id_list *list, unsigned nelem)
672{ 672{
673 struct request_queue *q = or->osd_dev->scsi_device->request_queue; 673 struct request_queue *q = osd_request_queue(or->osd_dev);
674 u64 len = nelem * sizeof(osd_id) + sizeof(*list); 674 u64 len = nelem * sizeof(osd_id) + sizeof(*list);
675 struct bio *bio; 675 struct bio *bio;
676 676
@@ -793,7 +793,7 @@ EXPORT_SYMBOL(osd_req_write);
793int osd_req_write_kern(struct osd_request *or, 793int osd_req_write_kern(struct osd_request *or,
794 const struct osd_obj_id *obj, u64 offset, void* buff, u64 len) 794 const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
795{ 795{
796 struct request_queue *req_q = or->osd_dev->scsi_device->request_queue; 796 struct request_queue *req_q = osd_request_queue(or->osd_dev);
797 struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL); 797 struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
798 798
799 if (IS_ERR(bio)) 799 if (IS_ERR(bio))
@@ -844,7 +844,7 @@ EXPORT_SYMBOL(osd_req_read);
844int osd_req_read_kern(struct osd_request *or, 844int osd_req_read_kern(struct osd_request *or,
845 const struct osd_obj_id *obj, u64 offset, void* buff, u64 len) 845 const struct osd_obj_id *obj, u64 offset, void* buff, u64 len)
846{ 846{
847 struct request_queue *req_q = or->osd_dev->scsi_device->request_queue; 847 struct request_queue *req_q = osd_request_queue(or->osd_dev);
848 struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL); 848 struct bio *bio = bio_map_kern(req_q, buff, len, GFP_KERNEL);
849 849
850 if (IS_ERR(bio)) 850 if (IS_ERR(bio))