lkml.org 
[lkml]   [2012]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[077/129] pnfsblock: acquire im_lock in _preload_range
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------
    Content-Length: 1825
    Lines: 58

    From: Peng Tao <bergwolf@gmail.com>

    commit 39e567ae36fe03c2b446e1b83ee3d39bea08f90b upstream.

    When calling _add_entry, we should take the im_lock to protect
    agains other modifiers.

    Signed-off-by: Peng Tao <peng_tao@emc.com>
    Signed-off-by: Benny Halevy <bhalevy@tonian.com>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/nfs/blocklayout/extents.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- a/fs/nfs/blocklayout/extents.c
    +++ b/fs/nfs/blocklayout/extents.c
    @@ -139,11 +139,13 @@ static int _set_range(struct my_tree *tr
    }

    /* Ensure that future operations on given range of tree will not malloc */
    -static int _preload_range(struct my_tree *tree, u64 offset, u64 length)
    +static int _preload_range(struct pnfs_inval_markings *marks,
    + u64 offset, u64 length)
    {
    u64 start, end, s;
    int count, i, used = 0, status = -ENOMEM;
    struct pnfs_inval_tracking **storage;
    + struct my_tree *tree = &marks->im_tree;

    dprintk("%s(%llu, %llu) enter\n", __func__, offset, length);
    start = normalize(offset, tree->mtt_step_size);
    @@ -161,12 +163,11 @@ static int _preload_range(struct my_tree
    goto out_cleanup;
    }

    - /* Now need lock - HOW??? */
    -
    + spin_lock(&marks->im_lock);
    for (s = start; s < end; s += tree->mtt_step_size)
    used += _add_entry(tree, s, INTERNAL_EXISTS, storage[used]);
    + spin_unlock(&marks->im_lock);

    - /* Unlock - HOW??? */
    status = 0;

    out_cleanup:
    @@ -286,7 +287,7 @@ int bl_mark_sectors_init(struct pnfs_inv

    start = normalize(offset, marks->im_block_size);
    end = normalize_up(offset + length, marks->im_block_size);
    - if (_preload_range(&marks->im_tree, start, end - start))
    + if (_preload_range(marks, start, end - start))
    goto outerr;

    spin_lock(&marks->im_lock);



    \
     
     \ /
      Last update: 2012-01-24 04:07    [W:0.031 / U:0.252 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site