Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25de9d6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove BIO_EOPNOTSUPP 



Since the big barrier rewrite/removal in 2007 we never fail FLUSH or
FUA requests, which means we can remove the magic BIO_EOPNOTSUPP flag
to help propagating those to the buffer_head layer.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJeff Moyer <jmoyer@redhat.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 4ecd4fef

block/bounce.c

+0 −3
Original line number Diff line number Diff line
@@ -128,9 +128,6 @@ static void bounce_end_io(struct bio *bio, mempool_t *pool, int err) 
	struct bio_vec *bvec, *org_vec;

	int i;



	if (test_bit(BIO_EOPNOTSUPP, &bio->bi_flags))

		set_bit(BIO_EOPNOTSUPP, &bio_orig->bi_flags);



	/*

	 * free up bounce indirect pages used

	 */

fs/btrfs/disk-io.c

+2 −9
Original line number Diff line number Diff line
@@ -3269,11 +3269,8 @@ static int write_dev_supers(struct btrfs_device *device, 
 */

static void btrfs_end_empty_barrier(struct bio *bio, int err)

{

	if (err) {

		if (err == -EOPNOTSUPP)

			set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);

	if (err)

		clear_bit(BIO_UPTODATE, &bio->bi_flags);

	}

	if (bio->bi_private)

		complete(bio->bi_private);

	bio_put(bio);
@@ -3301,11 +3298,7 @@ static int write_dev_flush(struct btrfs_device *device, int wait) 


		wait_for_completion(&device->flush_wait);



		if (bio_flagged(bio, BIO_EOPNOTSUPP)) {

			printk_in_rcu("BTRFS: disabling barriers on dev %s\n",

				      rcu_str_deref(device->name));

			device->nobarriers = 1;

		} else if (!bio_flagged(bio, BIO_UPTODATE)) {

		if (!bio_flagged(bio, BIO_UPTODATE)) {

			ret = -EIO;

			btrfs_dev_stat_inc_and_print(device,

				BTRFS_DEV_STAT_FLUSH_ERRS);

fs/btrfs/extent_io.c

+0 −2
Original line number Diff line number Diff line
@@ -2767,8 +2767,6 @@ static int __must_check submit_one_bio(int rw, struct bio *bio, 
	else

		btrfsic_submit_bio(rw, bio);



	if (bio_flagged(bio, BIO_EOPNOTSUPP))

		ret = -EOPNOTSUPP;

	bio_put(bio);

	return ret;

}

fs/buffer.c

+0 −10
Original line number Diff line number Diff line
@@ -2938,10 +2938,6 @@ static void end_bio_bh_io_sync(struct bio *bio, int err) 
{

	struct buffer_head *bh = bio->bi_private;



	if (err == -EOPNOTSUPP) {

		set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);

	}



	if (unlikely (test_bit(BIO_QUIET,&bio->bi_flags)))

		set_bit(BH_Quiet, &bh->b_state);
@@ -3041,13 +3037,7 @@ int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags) 
	if (buffer_prio(bh))

		rw |= REQ_PRIO;



	bio_get(bio);

	submit_bio(rw, bio);



	if (bio_flagged(bio, BIO_EOPNOTSUPP))

		ret = -EOPNOTSUPP;



	bio_put(bio);

	return ret;

}

EXPORT_SYMBOL_GPL(_submit_bh);

fs/ext4/page-io.c

+0 −1
Original line number Diff line number Diff line
@@ -359,7 +359,6 @@ void ext4_io_submit(struct ext4_io_submit *io) 
	if (bio) {

		bio_get(io->io_bio);

		submit_bio(io->io_op, io->io_bio);

		BUG_ON(bio_flagged(io->io_bio, BIO_EOPNOTSUPP));

		bio_put(io->io_bio);

	}

	io->io_bio = NULL;