Messages in this thread Patch in this message | | | Date | Fri, 12 Oct 2007 18:07:36 +0100 | From | Alasdair G Kergon <> | Subject | [2.6.24 PATCH 06/25] dm delay: fix ctr error paths |
| |
From: Dmitry Monakhov <dmonakhov@openvz.org>
Add missing 'dm_put_device' to dm-delay target constructor.
Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> Signed-off-by: Milan Broz <mbroz@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com> --- drivers/md/dm-delay.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-)
Index: linux-2.6.23/drivers/md/dm-delay.c =================================================================== --- linux-2.6.23.orig/drivers/md/dm-delay.c 2007-10-12 13:15:18.000000000 +0100 +++ linux-2.6.23/drivers/md/dm-delay.c 2007-10-12 13:15:33.000000000 +0100 @@ -163,34 +163,32 @@ static int delay_ctr(struct dm_target *t goto bad; } - if (argc == 3) { - dc->dev_write = NULL; + dc->dev_write = NULL; + if (argc == 3) goto out; - } if (sscanf(argv[4], "%llu", &tmpll) != 1) { ti->error = "Invalid write device sector"; - goto bad; + goto bad_dev_read; } dc->start_write = tmpll; if (sscanf(argv[5], "%u", &dc->write_delay) != 1) { ti->error = "Invalid write delay"; - goto bad; + goto bad_dev_read; } if (dm_get_device(ti, argv[3], dc->start_write, ti->len, dm_table_get_mode(ti->table), &dc->dev_write)) { ti->error = "Write device lookup failed"; - dm_put_device(ti, dc->dev_read); - goto bad; + goto bad_dev_read; } out: dc->delayed_pool = mempool_create_slab_pool(128, delayed_cache); if (!dc->delayed_pool) { DMERR("Couldn't create delayed bio pool."); - goto bad; + goto bad_dev_write; } setup_timer(&dc->delay_timer, handle_delayed_timer, (unsigned long)dc); @@ -203,6 +201,11 @@ out: ti->private = dc; return 0; +bad_dev_write: + if (dc->dev_write) + dm_put_device(ti, dc->dev_write); +bad_dev_read: + dm_put_device(ti, dc->dev_read); bad: kfree(dc); return -EINVAL; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |