| From fb8daba9847d1cec0ad747c294842263697ddfad Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 23:23:39 +0200 |
| Subject: [PATCH] hfs: Convert tree_lock to mutex |
| |
| commit 5f7f04de50d6b080cabc3dad3c83a1c18cc8d0ae in tip. |
| |
| tree_lock is used as mutex so make it a mutex. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Al Viro <viro@zeniv.linux.org.uk> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| fs/hfs/bfind.c | 4 ++-- |
| fs/hfs/btree.c | 2 +- |
| fs/hfs/btree.h | 2 +- |
| 3 files changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/fs/hfs/bfind.c b/fs/hfs/bfind.c |
| index 4129cdb..571abe9 100644 |
| --- a/fs/hfs/bfind.c |
| +++ b/fs/hfs/bfind.c |
| @@ -23,7 +23,7 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd) |
| 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 *fd) |
| 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; |
| } |
| |
| diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c |
| index 38a0a99..3ebc437 100644 |
| --- a/fs/hfs/btree.c |
| +++ b/fs/hfs/btree.c |
| @@ -27,7 +27,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke |
| if (!tree) |
| return NULL; |
| |
| - init_MUTEX(&tree->tree_lock); |
| + mutex_init(&tree->tree_lock); |
| spin_lock_init(&tree->hash_lock); |
| /* Set the correct compare function */ |
| tree->sb = sb; |
| diff --git a/fs/hfs/btree.h b/fs/hfs/btree.h |
| index cc51905..2a1d712 100644 |
| --- a/fs/hfs/btree.h |
| +++ b/fs/hfs/btree.h |
| @@ -33,7 +33,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; |
| -- |
| 1.7.0.4 |
| |