diff options
| author | Linus Torvalds | 2008-12-04 01:45:56 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2008-12-04 01:45:56 +0100 |
| commit | feaf3848a813a106f163013af6fcf6c4bfec92d9 (patch) | |
| tree | a5b2db24fa361e96efb64442f48e463154a66f8b /drivers | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| parent | block: fix setting of max_segment_size and seg_boundary mask (diff) | |
| download | kernel-qcow2-linux-feaf3848a813a106f163013af6fcf6c4bfec92d9.tar.gz kernel-qcow2-linux-feaf3848a813a106f163013af6fcf6c4bfec92d9.tar.xz kernel-qcow2-linux-feaf3848a813a106f163013af6fcf6c4bfec92d9.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: fix setting of max_segment_size and seg_boundary mask
block: internal dequeue shouldn't start timer
block: set disk->node_id before it's being used
When block layer fails to map iov, it calls bio_unmap_user to undo
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-table.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index a63161aec487..04e5fd742c2c 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -668,7 +668,7 @@ static void check_for_valid_limits(struct io_restrictions *rs) if (!rs->max_segment_size) rs->max_segment_size = MAX_SEGMENT_SIZE; if (!rs->seg_boundary_mask) - rs->seg_boundary_mask = -1; + rs->seg_boundary_mask = BLK_SEG_BOUNDARY_MASK; if (!rs->bounce_pfn) rs->bounce_pfn = -1; } |