aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/disk-io.c
diff options
context:
space:
mode:
authorMike Christie <mchristi@redhat.com>2016-06-05 15:31:41 -0400
committerJens Axboe <axboe@fb.com>2016-06-07 15:41:38 -0400
commit4e49ea4a3d276365bf7396c9b77b4d1d5923835a (patch)
treea49531413109137c3a6e40f02db7eb7969b2b672 /fs/btrfs/disk-io.c
parentaf8c34ce6ae32addda3788d54a7e340cad22516b (diff)
block/fs/drivers: remove rw argument from submit_bio
This has callers of submit_bio/submit_bio_wait set the bio->bi_rw instead of passing it in. This makes that use the same as generic_make_request and how we set the other bio fields. Signed-off-by: Mike Christie <mchristi@redhat.com> Fixed up fs/ext4/crypto.c Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
-rw-r--r--fs/btrfs/disk-io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 6628fca9f4ed..3666558a2375 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3486,12 +3486,13 @@ static int write_dev_flush(struct btrfs_device *device, int wait)
3486 3486
3487 bio->bi_end_io = btrfs_end_empty_barrier; 3487 bio->bi_end_io = btrfs_end_empty_barrier;
3488 bio->bi_bdev = device->bdev; 3488 bio->bi_bdev = device->bdev;
3489 bio->bi_rw = WRITE_FLUSH;
3489 init_completion(&device->flush_wait); 3490 init_completion(&device->flush_wait);
3490 bio->bi_private = &device->flush_wait; 3491 bio->bi_private = &device->flush_wait;
3491 device->flush_bio = bio; 3492 device->flush_bio = bio;
3492 3493
3493 bio_get(bio); 3494 bio_get(bio);
3494 btrfsic_submit_bio(WRITE_FLUSH, bio); 3495 btrfsic_submit_bio(bio);
3495 3496
3496 return 0; 3497 return 0;
3497} 3498}