lkml.org 
[lkml]   [2009]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 110/108] dm exception store: really fix type lookup
    2.6.30-stable review patch

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

    From: Milan Broz <mbroz@redhat.com>

    commit 874d2f61d31e596c36af7732dc1b3aa2dc233824 upstream.

    Fix exception store name handling.

    We need to reference exception store by zero terminated string.

    Fixes regression introduced in commit f6bd4eb73cdf2a5bf954e497972842f39cabb7e3

    Cc: Yi Yang <yi.y.yang@intel.com>
    Cc: Jonathan Brassow <jbrassow@redhat.com>
    Cc: stable@kernel.org
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Milan Broz <mbroz@redhat.com>
    Signed-off-by: Alasdair G Kergon <agk@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/md/dm-exception-store.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- 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_
    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_
    }

    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;

    \
     
     \ /
      Last update: 2009-07-01 20:17    [W:0.022 / U:1.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site