diff options
author | Christoph Hellwig <hch@lst.de> | 2015-04-24 15:41:01 -0400 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-05-19 11:17:03 -0400 |
commit | b25de9d6da49b1a8760a89672283128aa8c78345 (patch) | |
tree | 446d9186aebfbdb2156e438b6c85d84d44dd51a2 /fs/nilfs2/segbuf.c | |
parent | 4ecd4fef3a074c8bb43c391a57742c422469ebbd (diff) |
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jeff Moyer <jmoyer@redhat.com>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/nilfs2/segbuf.c')
-rw-r--r-- | fs/nilfs2/segbuf.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/fs/nilfs2/segbuf.c b/fs/nilfs2/segbuf.c index dc3a9efdaab8..42468e5ab3e7 100644 --- a/fs/nilfs2/segbuf.c +++ b/fs/nilfs2/segbuf.c | |||
@@ -343,11 +343,6 @@ static void nilfs_end_bio_write(struct bio *bio, int err) | |||
343 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); | 343 | const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); |
344 | struct nilfs_segment_buffer *segbuf = bio->bi_private; | 344 | struct nilfs_segment_buffer *segbuf = bio->bi_private; |
345 | 345 | ||
346 | if (err == -EOPNOTSUPP) { | ||
347 | set_bit(BIO_EOPNOTSUPP, &bio->bi_flags); | ||
348 | /* to be detected by nilfs_segbuf_submit_bio() */ | ||
349 | } | ||
350 | |||
351 | if (!uptodate) | 346 | if (!uptodate) |
352 | atomic_inc(&segbuf->sb_err); | 347 | atomic_inc(&segbuf->sb_err); |
353 | 348 | ||
@@ -374,15 +369,8 @@ static int nilfs_segbuf_submit_bio(struct nilfs_segment_buffer *segbuf, | |||
374 | 369 | ||
375 | bio->bi_end_io = nilfs_end_bio_write; | 370 | bio->bi_end_io = nilfs_end_bio_write; |
376 | bio->bi_private = segbuf; | 371 | bio->bi_private = segbuf; |
377 | bio_get(bio); | ||
378 | submit_bio(mode, bio); | 372 | submit_bio(mode, bio); |
379 | segbuf->sb_nbio++; | 373 | segbuf->sb_nbio++; |
380 | if (bio_flagged(bio, BIO_EOPNOTSUPP)) { | ||
381 | bio_put(bio); | ||
382 | err = -EOPNOTSUPP; | ||
383 | goto failed; | ||
384 | } | ||
385 | bio_put(bio); | ||
386 | 374 | ||
387 | wi->bio = NULL; | 375 | wi->bio = NULL; |
388 | wi->rest_blocks -= wi->end - wi->start; | 376 | wi->rest_blocks -= wi->end - wi->start; |