lkml.org 
[lkml]   [2010]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 03/10] hpfsplus: Convert tree_lock to mutex
    The tree_lock semaphore is used as mutex. Convert it to a real mutex.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Cc: Al Viro <viro@zeniv.linux.org.uk>

    ---
    fs/hfsplus/bfind.c | 4 ++--
    fs/hfsplus/btree.c | 2 +-
    fs/hfsplus/hfsplus_fs.h | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    Index: linux-2.6-tip/fs/hfsplus/bfind.c
    ===================================================================
    --- linux-2.6-tip.orig/fs/hfsplus/bfind.c
    +++ linux-2.6-tip/fs/hfsplus/bfind.c
    @@ -23,7 +23,7 @@ int hfs_find_init(struct hfs_btree *tree
    fd->search_key = ptr;
    fd->key = ptr + tree->max_key_len + 2;
    dprint(DBG_BNODE_REFS, "find_init: %d (%p)\n", tree->cnid, __builtin_return_address(0));
    - down(&tree->tree_lock);
    + mutex_lock(&tree->tree_lock);
    return 0;
    }

    @@ -32,7 +32,7 @@ void hfs_find_exit(struct hfs_find_data
    hfs_bnode_put(fd->bnode);
    kfree(fd->search_key);
    dprint(DBG_BNODE_REFS, "find_exit: %d (%p)\n", fd->tree->cnid, __builtin_return_address(0));
    - up(&fd->tree->tree_lock);
    + mutex_unlock(&fd->tree->tree_lock);
    fd->tree = NULL;
    }

    Index: linux-2.6-tip/fs/hfsplus/btree.c
    ===================================================================
    --- linux-2.6-tip.orig/fs/hfsplus/btree.c
    +++ linux-2.6-tip/fs/hfsplus/btree.c
    @@ -30,7 +30,7 @@ struct hfs_btree *hfs_btree_open(struct
    if (!tree)
    return NULL;

    - init_MUTEX(&tree->tree_lock);
    + mutex_init(&tree->tree_lock);
    spin_lock_init(&tree->hash_lock);
    tree->sb = sb;
    tree->cnid = id;
    Index: linux-2.6-tip/fs/hfsplus/hfsplus_fs.h
    ===================================================================
    --- linux-2.6-tip.orig/fs/hfsplus/hfsplus_fs.h
    +++ linux-2.6-tip/fs/hfsplus/hfsplus_fs.h
    @@ -62,7 +62,7 @@ struct hfs_btree {
    unsigned int depth;

    //unsigned int map1_size, map_size;
    - struct semaphore tree_lock;
    + struct mutex tree_lock;

    unsigned int pages_per_bnode;
    spinlock_t hash_lock;



    \
     
     \ /
      Last update: 2010-01-29 21:45    [W:0.028 / U:0.232 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site