From 8b4b25894305704ba3fccccdf7e4bb4efb19c279 Mon Sep 17 00:00:00 2001
From: Jens Axboe <jaxboe@fusionio.com>
Date: Sat, 23 Jul 2011 20:34:59 +0200
Subject: [PATCH] --- yaml --- r: 258615 b: refs/heads/master c:
 4c64500eada358165d0bb9a20d6c7d30821995b4 h: refs/heads/master i:   258613:
 5d85f1661fea1cf4825611d748bfb5274b28f4dc   258611:
 f47cee50e1092512e68d33dd6424e3e24483d798   258607:
 e06b1acde30136a8c2cc3b114b539290ef494748 v: v3

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

diff --git a/[refs] b/[refs]
index a633eeff852e..037c258e6202 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d7b7630130e52361af66ce3b994696e2357ba7de
+refs/heads/master: 4c64500eada358165d0bb9a20d6c7d30821995b4
diff --git a/trunk/block/blk-lib.c b/trunk/block/blk-lib.c
index 64974b1c7cca..2b461b496a78 100644
--- a/trunk/block/blk-lib.c
+++ b/trunk/block/blk-lib.c
@@ -59,7 +59,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
 	 * granularity
 	 */
 	max_discard_sectors = min(q->limits.max_discard_sectors, UINT_MAX >> 9);
-	if (!unlikely(!max_discard_sectors)) {
+	if (unlikely(!max_discard_sectors)) {
 		/* Avoid infinite loop below. Being cautious never hurts. */
 		return -EOPNOTSUPP;
 	} else if (q->limits.discard_granularity) {