diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 19:34:42 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 19:34:42 +0100 |
| commit | 5ac4d630eb87656bd4dc313b910776d54d88ea28 (patch) | |
| tree | de69640aee50ae7969dc3d5db223499e58795b47 | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | block: temporarily disable discard granularity (diff) | |
| download | linux-5ac4d630eb87656bd4dc313b910776d54d88ea28.tar.xz linux-5ac4d630eb87656bd4dc313b910776d54d88ea28.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: temporarily disable discard granularity
| -rw-r--r-- | block/blk-settings.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/block/blk-settings.c b/block/blk-settings.c index dd1f1e0e196f..6ae118d6e193 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -554,11 +554,18 @@ int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, 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 && (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) |