Commit b0200965 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net/davem/net-2.5

into home.osdl.org:/home/torvalds/v2.5/linux
parents 1cfab8d7 25f532b9
...@@ -489,6 +489,18 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start, ...@@ -489,6 +489,18 @@ int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
rs->max_sectors = rs->max_sectors =
min_not_zero(rs->max_sectors, q->max_sectors); min_not_zero(rs->max_sectors, q->max_sectors);
/* FIXME: Device-Mapper on top of RAID-0 breaks because DM
* currently doesn't honor MD's merge_bvec_fn routine.
* In this case, we'll force DM to use PAGE_SIZE or
* smaller I/O, just to be safe. A better fix is in the
* works, but add this for the time being so it will at
* least operate correctly.
*/
if (q->merge_bvec_fn)
rs->max_sectors =
min_not_zero(rs->max_sectors,
(unsigned short)(PAGE_SIZE >> 9));
rs->max_phys_segments = rs->max_phys_segments =
min_not_zero(rs->max_phys_segments, min_not_zero(rs->max_phys_segments,
q->max_phys_segments); q->max_phys_segments);
......
...@@ -32,8 +32,8 @@ do { \ ...@@ -32,8 +32,8 @@ do { \
#define preempt_enable_no_resched() \ #define preempt_enable_no_resched() \
do { \ do { \
dec_preempt_count(); \
barrier(); \ barrier(); \
dec_preempt_count(); \
} while (0) } while (0)
#define preempt_check_resched() \ #define preempt_check_resched() \
......
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