diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:43:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 12:43:36 -0700 |
| commit | b4f555081fdd27d13e6ff39d455d5aefae9d2c0c (patch) | |
| tree | 917acaae9556ad2c372d001bf786cfbcf8102684 /include/linux | |
| parent | 160acc2e899f26356bde92bc257253b7ca78f0c3 (diff) | |
| parent | 51fd77bd9f512ab6cc9df0733ba1caaab89eb957 (diff) | |
| download | op-kernel-dev-b4f555081fdd27d13e6ff39d455d5aefae9d2c0c.zip op-kernel-dev-b4f555081fdd27d13e6ff39d455d5aefae9d2c0c.tar.gz | |
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] Don't allow empty barriers to be passed down to queues that don't grok them
dm: bounce_pfn limit added
Deadline iosched: Fix batching fairness
Deadline iosched: Reset batch for ordered requests
Deadline iosched: Factor out finding latter reques
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device-mapper.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 37c66d1..b8b7c51 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -116,6 +116,7 @@ struct io_restrictions { unsigned short hardsect_size; unsigned int max_segment_size; unsigned long seg_boundary_mask; + unsigned long bounce_pfn; unsigned char no_cluster; /* inverted so that 0 is default */ }; |
