lkml.org 
[lkml]   [2014]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 59/81] dm thin: fix the error path for the thin device constructor
    Date
    3.8.13.20 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mike Snitzer <snitzer@redhat.com>

    commit 1acacc0784aab45627b6009e0e9224886279ac0b upstream.

    dm_pool_close_thin_device() must be called if dm_set_target_max_io_len()
    fails in thin_ctr(). Otherwise __pool_destroy() will fail because the
    pool will still have an open thin device:

    device-mapper: thin metadata: attempt to close pmd when 1 device(s) are still open
    device-mapper: thin: __pool_destroy: dm_pool_metadata_close() failed.

    Also, must establish error code if failing thin_ctr() because the pool
    is in fail_io mode.

    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    Acked-by: Joe Thornber <ejt@redhat.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/md/dm-thin.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c
    index e66e366..4d9659b 100644
    --- a/drivers/md/dm-thin.c
    +++ b/drivers/md/dm-thin.c
    @@ -2623,6 +2623,7 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv)

    if (get_pool_mode(tc->pool) == PM_FAIL) {
    ti->error = "Couldn't open thin device, Pool is in fail mode";
    + r = -EINVAL;
    goto bad_thin_open;
    }

    @@ -2634,7 +2635,7 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv)

    r = dm_set_target_max_io_len(ti, tc->pool->sectors_per_block);
    if (r)
    - goto bad_thin_open;
    + goto bad_target_max_io_len;

    ti->num_flush_requests = 1;
    ti->flush_supported = true;
    @@ -2655,6 +2656,8 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv)

    return 0;

    +bad_target_max_io_len:
    + dm_pool_close_thin_device(tc->td);
    bad_thin_open:
    __pool_dec(tc->pool);
    bad_pool_lookup:
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2014-03-25 19:01    [W:8.839 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site