| From 2ec1cea566f8468dc453c04b0544783ad6f6ecba Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sat, 25 Jul 2009 23:20:41 +0200 |
| Subject: [PATCH] hpfsplus: Convert tree_lock to mutex |
| |
| commit 2ec1cea566f8468dc453c04b0544783ad6f6ecba 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> |
| |
| diff --git a/fs/hfsplus/bfind.c b/fs/hfsplus/bfind.c |
| index 5007a41..68c7983 100644 |
| --- a/fs/hfsplus/bfind.c |
| +++ b/fs/hfsplus/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/hfsplus/btree.c b/fs/hfsplus/btree.c |
| index e49fcee..aa5fcb3 100644 |
| --- a/fs/hfsplus/btree.c |
| +++ b/fs/hfsplus/btree.c |
| @@ -30,7 +30,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id) |
| 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; |
| diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h |
| index 5c10d80..d15f35e 100644 |
| --- a/fs/hfsplus/hfsplus_fs.h |
| +++ b/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; |
| -- |
| 1.7.1.1 |
| |