projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into sh/hw-breakpoints
[deliverable/linux.git]
/
block
/
blk-settings.c
diff --git
a/block/blk-settings.c
b/block/blk-settings.c
index dd1f1e0e196f932cfe6abab7f74f84602557d05d..6ae118d6e19340ad60782c00d2476eeb9baeede7 100644
(file)
--- 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;
}
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;
}
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)
/* If top has no alignment offset, inherit from bottom */
if (!t->alignment_offset)
This page took
0.024272 seconds
and
5
git commands to generate.