diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:17:16 -0400 |
|---|---|---|
| committer | Mike Snitzer <snitzer@redhat.com> | 2015-05-29 14:17:16 -0400 |
| commit | 183f7802e73e26206558864d1b67e64382257277 (patch) | |
| tree | b380d7a8db726e7839f50fa07d3f1a1e80589ec3 /fs/buffer.c | |
| parent | 1c220c69ce0dcc0f234a9f263ad9c0864f971852 (diff) | |
| parent | f6454b049d81bb3d732b6a8afde08420589c6af9 (diff) | |
| download | linux-183f7802e73e26206558864d1b67e64382257277.tar.bz2 | |
Merge remote-tracking branch 'jens/for-4.2/core' into dm-4.2
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index c7a5602d01ee..f96173ad62d9 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -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); @@ -3000,7 +2996,6 @@ void guard_bio_eod(int rw, struct bio *bio) int _submit_bh(int rw, struct buffer_head *bh, unsigned long bio_flags) { struct bio *bio; - int ret = 0; BUG_ON(!buffer_locked(bh)); BUG_ON(!buffer_mapped(bh)); @@ -3041,14 +3036,8 @@ 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; + return 0; } EXPORT_SYMBOL_GPL(_submit_bh); |