blkdev: Do not return -EOPNOTSUPP if discard is supported

[karo-tx-linux.git] / block / blk-lib.c

diff --git a/block/blk-lib.c b/block/blk-lib.c
index d7a98d3ed4aa4f98ead1d50a3dc74e6b141b8a09..78e627e2581d5a6c80ec12d9267c57c0468ecf5f 100644 (file)
--- a/block/blk-lib.c
+++ b/block/blk-lib.c
@@ -19,11 +19,8 @@ static void bio_batch_end_io(struct bio *bio, int err)
 {
        struct bio_batch *bb = bio->bi_private;
 
-       if (err) {
-               if (err == -EOPNOTSUPP)
-                       set_bit(BIO_EOPNOTSUPP, &bb->flags);
+       if (err && (err != -EOPNOTSUPP))
                clear_bit(BIO_UPTODATE, &bb->flags);
-       }
        if (atomic_dec_and_test(&bb->done))
                complete(bb->wait);
        bio_put(bio);
@@ -107,9 +104,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
        if (!atomic_dec_and_test(&bb.done))
                wait_for_completion(&wait);
 
-       if (test_bit(BIO_EOPNOTSUPP, &bb.flags))
-               ret = -EOPNOTSUPP;
-       else if (!test_bit(BIO_UPTODATE, &bb.flags))
+       if (!test_bit(BIO_UPTODATE, &bb.flags))
                ret = -EIO;
 
        return ret;