Skip to content

Commit

Permalink
hfsplus: convert tree_lock to mutex
Browse files Browse the repository at this point in the history
tree_lock is used as mutex so make it a mutex.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Christoph Hellwig <hch@tuxera.com>
  • Loading branch information
Thomas Gleixner authored and Christoph Hellwig committed Oct 1, 2010
1 parent 7fcc99f commit 467c3d9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions fs/hfsplus/bfind.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion fs/hfsplus/btree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fs/hfsplus/hfsplus_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 467c3d9

Please sign in to comment.