leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hfs: Convert tree_lock to mutex

Browse Source 
tree_lock is used as mutex so make it a mutex.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
LKML-Reference: <20100907125056.416332114@linutronix.de>
This commit is contained in:
Thomas Gleixner 2010-09-07 14:33:08 +00:00
parent 5356d94872
commit 4a94103554
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/hfs/bfind.c
View File

@ -23,7 +23,7 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd)
fd->search_key = ptr; fd->search_key = ptr;
fd->key = ptr + tree->max_key_len + 2; fd->key = ptr + tree->max_key_len + 2;
dprint(DBG_BNODE_REFS, "find_init: %d (%p)\n", tree->cnid, __builtin_return_address(0)); 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; return 0;
} }
@ -32,7 +32,7 @@ void hfs_find_exit(struct hfs_find_data *fd)
hfs_bnode_put(fd->bnode); hfs_bnode_put(fd->bnode);
kfree(fd->search_key); kfree(fd->search_key);
dprint(DBG_BNODE_REFS, "find_exit: %d (%p)\n", fd->tree->cnid, __builtin_return_address(0)); 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; fd->tree = NULL;
} }

2
fs/hfs/btree.c
View File

@ -27,7 +27,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
if (!tree) if (!tree)
return NULL; return NULL;
init_MUTEX(&tree->tree_lock); mutex_init(&tree->tree_lock);
spin_lock_init(&tree->hash_lock); spin_lock_init(&tree->hash_lock);
/* Set the correct compare function */ /* Set the correct compare function */
tree->sb = sb; tree->sb = sb;

2
fs/hfs/btree.h
View File

@ -33,7 +33,7 @@ struct hfs_btree {
unsigned int depth; unsigned int depth;
//unsigned int map1_size, map_size; //unsigned int map1_size, map_size;
struct semaphore tree_lock; struct mutex tree_lock;
unsigned int pages_per_bnode; unsigned int pages_per_bnode;
spinlock_t hash_lock; spinlock_t hash_lock;