From jens.axboe@oracle.com Wed Dec  9 14:10:04 2009
Date: Wed, 9 Dec 2009 23:07:49 +0100
From: Jens Axboe <jens.axboe@oracle.com>
To: Heinz Diehl <htd@fancy-poultry.org>
Cc: linux-kernel@vger.kernel.org, martin.petersen@oracle.com
Subject: Re: todays git regression (2.6.32-04008.g3ff6a46): lot of device mapper warnings

[...]
Does this work?

diff --git a/block/blk-settings.c b/block/blk-settings.c
index dd1f1e0..0116d29 100644
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -554,11 +554,13 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
 		ret = -1;
 	}
 
+#if 0
 	if (offset &&
 	    (offset & (b->discard_granularity - 1)) != b->discard_alignment) {
 		t->discard_misaligned = 1;
 		ret = -1;
 	}
+#endif
 
 	/* If top has no alignment offset, inherit from bottom */
 	if (!t->alignment_offset)

-- 
Jens Axboe