diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-10-23 04:57:50 (GMT) |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-10-23 04:57:50 (GMT) |
| commit | 274035751e25ee15a064e43cde7b4e7a9b75d921 (patch) | |
| tree | bf5f3f18f14855043324ef02a116532d866e3dac /drivers/md/dm-exception-store.c | |
| parent | 53e597b1d194910bef53ed0632da329fef497904 (diff) | |
| parent | a5be88f63eaff1c03774aecd7388015cb87f6b2c (diff) | |
| download | linux-274035751e25ee15a064e43cde7b4e7a9b75d921.tar.xz | |
Merge branch 'topic/hw-constraint-single' into for-next
Diffstat (limited to 'drivers/md/dm-exception-store.c')
| -rw-r--r-- | drivers/md/dm-exception-store.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/md/dm-exception-store.c b/drivers/md/dm-exception-store.c index ebaa4f8..192bb8b 100644 --- a/drivers/md/dm-exception-store.c +++ b/drivers/md/dm-exception-store.c @@ -203,7 +203,7 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv, return -EINVAL; } - tmp_store = kmalloc(sizeof(*tmp_store), GFP_KERNEL); + tmp_store = kzalloc(sizeof(*tmp_store), GFP_KERNEL); if (!tmp_store) { ti->error = "Exception store allocation failed"; return -ENOMEM; @@ -215,7 +215,7 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv, else if (persistent == 'N') type = get_type("N"); else { - ti->error = "Persistent flag is not P or N"; + ti->error = "Exception store type is not P or N"; r = -EINVAL; goto bad_type; } @@ -233,7 +233,7 @@ int dm_exception_store_create(struct dm_target *ti, int argc, char **argv, if (r) goto bad; - r = type->ctr(tmp_store, 0, NULL); + r = type->ctr(tmp_store, (strlen(argv[0]) > 1 ? &argv[0][1] : NULL)); if (r) { ti->error = "Exception store type constructor failed"; goto bad; |