---

yaml --- r: 242767 b: refs/heads/master c: 115ee88 h: refs/heads/master i: 242765: 02ba5b6 242763: 6cc4dbe 242759: 53fec9a 242751: 6eec132 v: v3
git-mirror · Mar 11, 2011 · c275644 · c275644
1 parent 08f5b09
commit c275644
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c7519dbf6f4b4408229d279d799c938ffdd06f21
+refs/heads/master: 115ee88c15b55859a8b59c5dccb3882bbd47e542
diff --git a/trunk/drivers/mtd/mtd_blkdevs.c b/trunk/drivers/mtd/mtd_blkdevs.c
@@ -405,9 +405,10 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new)
 	new->rq->queuedata = new;
 	blk_queue_logical_block_size(new->rq, tr->blksize);
 
-	if (tr->discard)
-		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
-					new->rq);
+	if (tr->discard) {
+		queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, new->rq);
+		new->rq->limits.max_discard_sectors = UINT_MAX;
+	}
 
 	gd->queue = new->rq;