diff options
| author | Christoph Hellwig <hch@infradead.org> | 2010-08-18 05:29:23 -0400 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-09-10 06:35:40 -0400 |
| commit | 0edd55faea7c8081bc826234b917501738a6218f (patch) | |
| tree | 36a7add738bf47ce960d499f4cc96b38c5194c25 /fs | |
| parent | 8c5553678237b7121355108e03c36086037d8975 (diff) | |
block: remove the BH_Eopnotsupp flag
This flag was only set for barrier buffers, which we don't submit
anymore.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/buffer.c | 7 | ||||
| -rw-r--r-- | fs/fat/misc.c | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 3e7dca279d1c..7f0b9b083f77 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -156,7 +156,7 @@ void end_buffer_write_sync(struct buffer_head *bh, int uptodate) | |||
| 156 | if (uptodate) { | 156 | if (uptodate) { |
| 157 | set_buffer_uptodate(bh); | 157 | set_buffer_uptodate(bh); |
| 158 | } else { | 158 | } else { |
| 159 | if (!buffer_eopnotsupp(bh) && !quiet_error(bh)) { | 159 | if (!quiet_error(bh)) { |
| 160 | buffer_io_error(bh); | 160 | buffer_io_error(bh); |
| 161 | printk(KERN_WARNING "lost page write due to " | 161 | printk(KERN_WARNING "lost page write due to " |
| 162 | "I/O error on %s\n", | 162 | "I/O error on %s\n", |
| @@ -2891,7 +2891,6 @@ static void end_bio_bh_io_sync(struct bio *bio, int err) | |||
| 2891 | 2891 | ||
| 2892 | if (err == -EOPNOTSUPP) { | 2892 | if (err == -EOPNOTSUPP) { |
| 2893 | set_bit(BIO_EOPNOTSUPP, &bio->bi_flags); | 2893 | set_bit(BIO_EOPNOTSUPP, &bio->bi_flags); |
| 2894 | set_bit(BH_Eopnotsupp, &bh->b_state); | ||
| 2895 | } | 2894 | } |
| 2896 | 2895 | ||
| 2897 | if (unlikely (test_bit(BIO_QUIET,&bio->bi_flags))) | 2896 | if (unlikely (test_bit(BIO_QUIET,&bio->bi_flags))) |
| @@ -3031,10 +3030,6 @@ int __sync_dirty_buffer(struct buffer_head *bh, int rw) | |||
| 3031 | bh->b_end_io = end_buffer_write_sync; | 3030 | bh->b_end_io = end_buffer_write_sync; |
| 3032 | ret = submit_bh(rw, bh); | 3031 | ret = submit_bh(rw, bh); |
| 3033 | wait_on_buffer(bh); | 3032 | wait_on_buffer(bh); |
| 3034 | if (buffer_eopnotsupp(bh)) { | ||
| 3035 | clear_buffer_eopnotsupp(bh); | ||
| 3036 | ret = -EOPNOTSUPP; | ||
| 3037 | } | ||
| 3038 | if (!ret && !buffer_uptodate(bh)) | 3033 | if (!ret && !buffer_uptodate(bh)) |
| 3039 | ret = -EIO; | 3034 | ret = -EIO; |
| 3040 | } else { | 3035 | } else { |
diff --git a/fs/fat/misc.c b/fs/fat/misc.c index 1736f2356388..970e682ea754 100644 --- a/fs/fat/misc.c +++ b/fs/fat/misc.c | |||
| @@ -255,10 +255,7 @@ int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs) | |||
| 255 | 255 | ||
| 256 | for (i = 0; i < nr_bhs; i++) { | 256 | for (i = 0; i < nr_bhs; i++) { |
| 257 | wait_on_buffer(bhs[i]); | 257 | wait_on_buffer(bhs[i]); |
| 258 | if (buffer_eopnotsupp(bhs[i])) { | 258 | if (!err && !buffer_uptodate(bhs[i])) |
| 259 | clear_buffer_eopnotsupp(bhs[i]); | ||
| 260 | err = -EOPNOTSUPP; | ||
| 261 | } else if (!err && !buffer_uptodate(bhs[i])) | ||
| 262 | err = -EIO; | 259 | err = -EIO; |
| 263 | } | 260 | } |
| 264 | return err; | 261 | return err; |
