mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
block: submit_bio_wait() conversions
It was being open coded in a few places. Signed-off-by: Kent Overstreet <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Joern Engel <[email protected]> Cc: Prasad Joshi <[email protected]> Cc: Neil Brown <[email protected]> Cc: Chris Mason <[email protected]> Acked-by: NeilBrown <[email protected]>
This commit is contained in:
parent
6ce4eac1f6
commit
33879d4512
8 changed files with 24 additions and 118 deletions
|
|
@ -24,13 +24,6 @@ struct hfsplus_wd {
|
|||
u16 embed_count;
|
||||
};
|
||||
|
||||
static void hfsplus_end_io_sync(struct bio *bio, int err)
|
||||
{
|
||||
if (err)
|
||||
clear_bit(BIO_UPTODATE, &bio->bi_flags);
|
||||
complete(bio->bi_private);
|
||||
}
|
||||
|
||||
/*
|
||||
* hfsplus_submit_bio - Perfrom block I/O
|
||||
* @sb: super block of volume for I/O
|
||||
|
|
@ -53,7 +46,6 @@ static void hfsplus_end_io_sync(struct bio *bio, int err)
|
|||
int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
|
||||
void *buf, void **data, int rw)
|
||||
{
|
||||
DECLARE_COMPLETION_ONSTACK(wait);
|
||||
struct bio *bio;
|
||||
int ret = 0;
|
||||
u64 io_size;
|
||||
|
|
@ -73,8 +65,6 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
|
|||
bio = bio_alloc(GFP_NOIO, 1);
|
||||
bio->bi_sector = sector;
|
||||
bio->bi_bdev = sb->s_bdev;
|
||||
bio->bi_end_io = hfsplus_end_io_sync;
|
||||
bio->bi_private = &wait;
|
||||
|
||||
if (!(rw & WRITE) && data)
|
||||
*data = (u8 *)buf + offset;
|
||||
|
|
@ -93,12 +83,7 @@ int hfsplus_submit_bio(struct super_block *sb, sector_t sector,
|
|||
buf = (u8 *)buf + len;
|
||||
}
|
||||
|
||||
submit_bio(rw, bio);
|
||||
wait_for_completion(&wait);
|
||||
|
||||
if (!bio_flagged(bio, BIO_UPTODATE))
|
||||
ret = -EIO;
|
||||
|
||||
ret = submit_bio_wait(rw, bio);
|
||||
out:
|
||||
bio_put(bio);
|
||||
return ret < 0 ? ret : 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue