diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org>
| 2009-07-27 12:16:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org>
| 2009-07-27 12:16:21 -0700 |
| commit | 4897f1011aff7534b8e319404f7cd4028de7a453 (patch) | |
| tree | 610380b8e0899cb6bb0f088d17d87c67a1c15618 /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| parent | dm table: pass correct dev area size to device_area_is_valid (diff) | |
| download | linux-4897f1011aff7534b8e319404f7cd4028de7a453.tar.gz linux-4897f1011aff7534b8e319404f7cd4028de7a453.tar.bz2 linux-4897f1011aff7534b8e319404f7cd4028de7a453.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm
* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
dm table: pass correct dev area size to device_area_is_valid
dm: remove queue next_ordered workaround for barriers
dm raid1: wake kmirrord when requeueing delayed bios after remote recovery
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/device-mapper.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index 0d6310657f32..655e7721580a 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h @@ -84,7 +84,7 @@ typedef int (*dm_merge_fn) (struct dm_target *ti, struct bvec_merge_data *bvm, typedef int (*iterate_devices_callout_fn) (struct dm_target *ti, struct dm_dev *dev, - sector_t physical_start, + sector_t start, sector_t len, void *data); typedef int (*dm_iterate_devices_fn) (struct dm_target *ti, @@ -104,7 +104,7 @@ void dm_error(const char *message); * Combine device limits. */ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, - sector_t start, void *data); + sector_t start, sector_t len, void *data); struct dm_dev { struct block_device *bdev; |