projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.81' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
block
/
blk-settings.c
diff --git
a/block/blk-settings.c
b/block/blk-settings.c
index c50ecf0ea3b17c652db8c134905de38e56713851..ec00a0f7521206a9912c29407c2a64869a91b081 100644
(file)
--- a/
block/blk-settings.c
+++ b/
block/blk-settings.c
@@
-144,6
+144,7
@@
void blk_set_stacking_limits(struct queue_limits *lim)
lim->discard_zeroes_data = 1;
lim->max_segments = USHRT_MAX;
lim->max_hw_sectors = UINT_MAX;
lim->discard_zeroes_data = 1;
lim->max_segments = USHRT_MAX;
lim->max_hw_sectors = UINT_MAX;
+ lim->max_segment_size = UINT_MAX;
lim->max_sectors = UINT_MAX;
lim->max_write_same_sectors = UINT_MAX;
}
lim->max_sectors = UINT_MAX;
lim->max_write_same_sectors = UINT_MAX;
}
@@
-552,7
+553,7
@@
int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
bottom = max(b->physical_block_size, b->io_min) + alignment;
/* Verify that top and bottom intervals line up */
bottom = max(b->physical_block_size, b->io_min) + alignment;
/* Verify that top and bottom intervals line up */
- if (max(top, bottom)
& (min(top, bottom) - 1
)) {
+ if (max(top, bottom)
% min(top, bottom
)) {
t->misaligned = 1;
ret = -1;
}
t->misaligned = 1;
ret = -1;
}
@@
-593,7
+594,7
@@
int blk_stack_limits(struct queue_limits *t, struct queue_limits *b,
/* Find lowest common alignment_offset */
t->alignment_offset = lcm(t->alignment_offset, alignment)
/* Find lowest common alignment_offset */
t->alignment_offset = lcm(t->alignment_offset, alignment)
-
& (max(t->physical_block_size, t->io_min) - 1
);
+
% max(t->physical_block_size, t->io_min
);
/* Verify that new alignment_offset is on a logical block boundary */
if (t->alignment_offset & (t->logical_block_size - 1)) {
/* Verify that new alignment_offset is on a logical block boundary */
if (t->alignment_offset & (t->logical_block_size - 1)) {