From 6c2daa93efafeacb6e6119c6213ce60f3e53038b Mon Sep 17 00:00:00 2001
From: Lukas Czerner <lczerner@redhat.com>
Date: Fri, 6 May 2011 19:30:01 -0600
Subject: [PATCH] --- yaml --- r: 251143 b: refs/heads/master c:
 8af1954d172a46a63e5e79dae523a6d74715e458 h: refs/heads/master i:   251141:
 2103e6c77cda5e106697d947529dd69640ceead1   251139:
 ae40f0c746e2e9de33af5e9b9ad1cb9e6d4e864e   251135:
 c23549023346d5430b1dbfe80007dcc07d9261c2 v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-lib.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 30fa63894799..db191bcf19a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5baebe5c86acd6100536a466905880529f79cf1a
+refs/heads/master: 8af1954d172a46a63e5e79dae523a6d74715e458
diff --git a/trunk/block/blk-lib.c b/trunk/block/blk-lib.c
index d7a98d3ed4aa..78e627e2581d 100644
--- a/trunk/block/blk-lib.c
+++ b/trunk/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;