diff options
Diffstat (limited to 'fs/exofs/inode.c')
-rw-r--r-- | fs/exofs/inode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/exofs/inode.c b/fs/exofs/inode.c index ba8d9fab4693..77d0a295eb1c 100644 --- a/fs/exofs/inode.c +++ b/fs/exofs/inode.c | |||
@@ -59,10 +59,9 @@ static void _pcol_init(struct page_collect *pcol, unsigned expected_pages, | |||
59 | struct inode *inode) | 59 | struct inode *inode) |
60 | { | 60 | { |
61 | struct exofs_sb_info *sbi = inode->i_sb->s_fs_info; | 61 | struct exofs_sb_info *sbi = inode->i_sb->s_fs_info; |
62 | struct request_queue *req_q = sbi->s_dev->scsi_device->request_queue; | ||
63 | 62 | ||
64 | pcol->sbi = sbi; | 63 | pcol->sbi = sbi; |
65 | pcol->req_q = req_q; | 64 | pcol->req_q = osd_request_queue(sbi->s_dev); |
66 | pcol->inode = inode; | 65 | pcol->inode = inode; |
67 | pcol->expected_pages = expected_pages; | 66 | pcol->expected_pages = expected_pages; |
68 | 67 | ||
@@ -266,7 +265,7 @@ static int read_exec(struct page_collect *pcol, bool is_sync) | |||
266 | goto err; | 265 | goto err; |
267 | } | 266 | } |
268 | 267 | ||
269 | osd_req_read(or, &obj, pcol->bio, i_start); | 268 | osd_req_read(or, &obj, i_start, pcol->bio, pcol->length); |
270 | 269 | ||
271 | if (is_sync) { | 270 | if (is_sync) { |
272 | exofs_sync_op(or, pcol->sbi->s_timeout, oi->i_cred); | 271 | exofs_sync_op(or, pcol->sbi->s_timeout, oi->i_cred); |
@@ -522,7 +521,8 @@ static int write_exec(struct page_collect *pcol) | |||
522 | 521 | ||
523 | *pcol_copy = *pcol; | 522 | *pcol_copy = *pcol; |
524 | 523 | ||
525 | osd_req_write(or, &obj, pcol_copy->bio, i_start); | 524 | pcol_copy->bio->bi_rw |= (1 << BIO_RW); /* FIXME: bio_set_dir() */ |
525 | osd_req_write(or, &obj, i_start, pcol_copy->bio, pcol_copy->length); | ||
526 | ret = exofs_async_op(or, writepages_done, pcol_copy, oi->i_cred); | 526 | ret = exofs_async_op(or, writepages_done, pcol_copy, oi->i_cred); |
527 | if (unlikely(ret)) { | 527 | if (unlikely(ret)) { |
528 | EXOFS_ERR("write_exec: exofs_async_op() Faild\n"); | 528 | EXOFS_ERR("write_exec: exofs_async_op() Faild\n"); |