Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 467c3d9c authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Christoph Hellwig
Browse files

hfsplus: convert tree_lock to mutex 



tree_lock is used as mutex so make it a mutex.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarChristoph Hellwig <hch@tuxera.com>
parent 7fcc99f4

fs/hfsplus/bfind.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}

fs/hfsplus/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/hfsplus/hfsplus_fs.h

+1 −1
Original line number Diff line number Diff line
@@ -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;