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

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

block: remove the BH_Eopnotsupp flag 



This flag was only set for barrier buffers, which we don't submit
anymore.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 8c555367

fs/buffer.c

+1 −6
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate) 
	if (uptodate) {

		set_buffer_uptodate(bh);

	} else {

		if (!buffer_eopnotsupp(bh) && !quiet_error(bh)) {

		if (!quiet_error(bh)) {

			buffer_io_error(bh);

			printk(KERN_WARNING "lost page write due to "

					"I/O error on %s\n",
@@ -2891,7 +2891,6 @@ static void end_bio_bh_io_sync(struct bio *bio, int err) 


	if (err == -EOPNOTSUPP) {

		set_bit(BIO_EOPNOTSUPP, &bio->bi_flags);

		set_bit(BH_Eopnotsupp, &bh->b_state);

	}



	if (unlikely (test_bit(BIO_QUIET,&bio->bi_flags)))
@@ -3031,10 +3030,6 @@ int __sync_dirty_buffer(struct buffer_head *bh, int rw) 
		bh->b_end_io = end_buffer_write_sync;

		ret = submit_bh(rw, bh);

		wait_on_buffer(bh);

		if (buffer_eopnotsupp(bh)) {

			clear_buffer_eopnotsupp(bh);

			ret = -EOPNOTSUPP;

		}

		if (!ret && !buffer_uptodate(bh))

			ret = -EIO;

	} else {

fs/fat/misc.c

+1 −4
Original line number Diff line number Diff line
@@ -255,10 +255,7 @@ int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs) 


	for (i = 0; i < nr_bhs; i++) {

		wait_on_buffer(bhs[i]);

		if (buffer_eopnotsupp(bhs[i])) {

			clear_buffer_eopnotsupp(bhs[i]);

			err = -EOPNOTSUPP;

		} else if (!err && !buffer_uptodate(bhs[i]))

		if (!err && !buffer_uptodate(bhs[i]))

			err = -EIO;

	}

	return err;

include/linux/buffer_head.h

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ enum bh_state_bits { 
	BH_Delay,	/* Buffer is not yet allocated on disk */

	BH_Boundary,	/* Block is followed by a discontiguity */

	BH_Write_EIO,	/* I/O error on write */

	BH_Eopnotsupp,	/* DEPRECATED: operation not supported (barrier) */

	BH_Unwritten,	/* Buffer is allocated on disk but not written */

	BH_Quiet,	/* Buffer Error Prinks to be quiet */
@@ -124,7 +123,6 @@ BUFFER_FNS(Async_Write, async_write) 
BUFFER_FNS(Delay, delay)

BUFFER_FNS(Boundary, boundary)

BUFFER_FNS(Write_EIO, write_io_error)

BUFFER_FNS(Eopnotsupp, eopnotsupp)

BUFFER_FNS(Unwritten, unwritten)



#define bh_offset(bh)		((unsigned long)(bh)->b_data & ~PAGE_MASK)