A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

[SCSI] libosd: osd_req_{read,write} takes a length parameter

Browse source 
For supporting of chained-bios we can not inspect the first
bio only, as before. Caller shall pass the total length of the
request, ie. sum_bytes(bio-chain).

Also since the bio might be a chain we don't set it's direction
on behalf of it's callers. The bio direction should be properly
set prior to this call. So fix a couple of write users that now
need to set the bio direction properly

[In this patch I change both library code and user sites at
 exofs, to make it easy on integration. It should be submitted
 via James's scsi-misc tree.]

Signed-off-by: Boaz Harrosh <[email protected]>
CC: Jeff Garzik <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
This commit is contained in:
Boaz Harrosh 2009-05-24 20:04:26 +03:00 • committed by James Bottomley
commit 62f469b596
3 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

23
drivers/scsi/osd/osd_initiator.c
View file

@ -779,13 +779,14 @@ EXPORT_SYMBOL(osd_req_remove_object);
*/
void osd_req_write(struct osd_request *or,
const struct osd_obj_id *obj, struct bio *bio, u64 offset)
const struct osd_obj_id *obj, u64 offset,
struct bio *bio, u64 len)
{
_osd_req_encode_common(or, OSD_ACT_WRITE, obj, offset, bio->bi_size);
_osd_req_encode_common(or, OSD_ACT_WRITE, obj, offset, len);
WARN_ON(or->out.bio || or->out.total_bytes);
bio->bi_rw |= (1 << BIO_RW);
WARN_ON(0 == bio_rw_flagged(bio, BIO_RW));
or->out.bio = bio;
or->out.total_bytes = bio->bi_size;
or->out.total_bytes = len;
}
EXPORT_SYMBOL(osd_req_write);
@ -798,7 +799,8 @@ int osd_req_write_kern(struct osd_request *or,
if (IS_ERR(bio))
return PTR_ERR(bio);
osd_req_write(or, obj, bio, offset);
bio->bi_rw |= (1 << BIO_RW); /* FIXME: bio_set_dir() */
osd_req_write(or, obj, offset, bio, len);
return 0;
}
EXPORT_SYMBOL(osd_req_write_kern);
@ -828,13 +830,14 @@ void osd_req_flush_object(struct osd_request *or,
EXPORT_SYMBOL(osd_req_flush_object);
void osd_req_read(struct osd_request *or,
const struct osd_obj_id *obj, struct bio *bio, u64 offset)
const struct osd_obj_id *obj, u64 offset,
struct bio *bio, u64 len)
{
_osd_req_encode_common(or, OSD_ACT_READ, obj, offset, bio->bi_size);
_osd_req_encode_common(or, OSD_ACT_READ, obj, offset, len);
WARN_ON(or->in.bio || or->in.total_bytes);
bio->bi_rw &= ~(1 << BIO_RW);
WARN_ON(1 == bio_rw_flagged(bio, BIO_RW));
or->in.bio = bio;
or->in.total_bytes = bio->bi_size;
or->in.total_bytes = len;
}
EXPORT_SYMBOL(osd_req_read);
@ -847,7 +850,7 @@ int osd_req_read_kern(struct osd_request *or,
if (IS_ERR(bio))
return PTR_ERR(bio);
osd_req_read(or, obj, bio, offset);
osd_req_read(or, obj, offset, bio, len);
return 0;
}
EXPORT_SYMBOL(osd_req_read_kern);