diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:04:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:04:14 -0700 |
| commit | 9fcfc91bda04259abb9af2fd83bbf48d19da8502 (patch) | |
| tree | a8613d90a324d61d724f516d03819e1d00a0aa54 | |
| parent | 55bcab46955644d5a8149a9b3cc9752a336e02f8 (diff) | |
| parent | ea9df47cc92573b159ef3b4fda516c32cba9c4fd (diff) | |
| download | linux-3.10-9fcfc91bda04259abb9af2fd83bbf48d19da8502.tar.gz linux-3.10-9fcfc91bda04259abb9af2fd83bbf48d19da8502.tar.bz2 linux-3.10-9fcfc91bda04259abb9af2fd83bbf48d19da8502.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: fix blk_stack_limits arg to use bytes not sectors
dm exception store: really fix type lookup
| -rw-r--r-- | drivers/md/dm-exception-store.c | 9 | ||||
| -rw-r--r-- | drivers/md/dm-table.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c index c3ae51584b1..3710ff88fc1 100644 --- a/drivers/md/dm-exception-store.c +++ b/drivers/md/dm-exception-store.c @@ -195,7 +195,7 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv, struct dm_exception_store **store) { int r = 0; - struct dm_exception_store_type *type; + struct dm_exception_store_type *type = NULL; struct dm_exception_store *tmp_store; char persistent; @@ -211,12 +211,15 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv, } persistent = toupper(*argv[1]); - if (persistent != 'P' && persistent != 'N') { + if (persistent == 'P') + type = get_type("P"); + else if (persistent == 'N') + type = get_type("N"); + else { ti->error = "Persistent flag is not P or N"; return -EINVAL; } - type = get_type(&persistent); if (!type) { ti->error = "Exception store type not recognised"; r = -EINVAL; diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 4899ebe767c..2cba557d9e6 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c @@ -495,7 +495,7 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, return 0; } - if (blk_stack_limits(limits, &q->limits, start) < 0) + if (blk_stack_limits(limits, &q->limits, start << 9) < 0) DMWARN("%s: target device %s is misaligned", dm_device_name(ti->table->md), bdevname(bdev, b)); |