Commit b568be62 authored by Jens Axboe's avatar Jens Axboe

block: temporarily disable discard granularity

Commit 86b37281 adds a check for
misaligned stacking offsets, but it's buggy since the defaults are 0.
Hence all dm devices that pass in a non-zero starting offset will
be marked as misaligned amd dm will complain.

A real fix is coming, in the mean time disable the discard granularity
check so that users don't worry about dm reporting about misaligned
devices.
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 8bea8672
...@@ -554,11 +554,18 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, ...@@ -554,11 +554,18 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
ret = -1; ret = -1;
} }
/*
* Temporarily disable discard granularity. It's currently buggy
* since we default to 0 for discard_granularity, hence this
* "failure" will always trigger for non-zero offsets.
*/
#if 0
if (offset && if (offset &&
(offset & (b->discard_granularity - 1)) != b->discard_alignment) { (offset & (b->discard_granularity - 1)) != b->discard_alignment) {
t->discard_misaligned = 1; t->discard_misaligned = 1;
ret = -1; ret = -1;
} }
#endif
/* If top has no alignment offset, inherit from bottom */ /* If top has no alignment offset, inherit from bottom */
if (!t->alignment_offset) if (!t->alignment_offset)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment