diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2010-10-01 05:46:52 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2010-10-01 05:46:52 +0200 |
| commit | 467c3d9cd541eef284ff8118069b088e015b8d6a (patch) | |
| tree | 3d3126209f6c5a0c4660e8405ac2680d6388f359 /fs | |
| parent | 7fcc99f4f2ddb1c39abc05fbb9b32f05b03c7f8f (diff) | |
| download | op-kernel-dev-467c3d9cd541eef284ff8118069b088e015b8d6a.zip op-kernel-dev-467c3d9cd541eef284ff8118069b088e015b8d6a.tar.gz | |
hfsplus: convert tree_lock to mutex
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/hfsplus/bfind.c | 4 | ||||
| -rw-r--r-- | fs/hfsplus/btree.c | 2 | ||||
| -rw-r--r-- | fs/hfsplus/hfsplus_fs.h | 2 |
3 files changed, 4 insertions, 4 deletions
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 27504f5..8306479 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 c007cc2..5cda963 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; |
