From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932294Ab0IGOeR (ORCPT ); Tue, 7 Sep 2010 10:34:17 -0400 Received: from www.tglx.de ([62.245.132.106]:43922 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932116Ab0IGOdw (ORCPT ); Tue, 7 Sep 2010 10:33:52 -0400 Message-Id: <20100907125056.416332114@linutronix.de> User-Agent: quilt/0.47-1 Date: Tue, 07 Sep 2010 14:33:08 -0000 From: Thomas Gleixner To: LKML Cc: Andrew Morton , Ingo Molnar , Peter Zijlstra , Christoph Hellwig , Al Viro , linux-fsdevel@vger.kernel.org Subject: [patch 18/30] hfs: Convert tree_lock to mutex References: <20100907124636.880953480@linutronix.de> Content-Disposition: inline; filename=hfs-sema-to-mutex.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org tree_lock is used as mutex so make it a mutex. Signed-off-by: Thomas Gleixner Cc: Al Viro Cc: linux-fsdevel@vger.kernel.org --- fs/hfs/bfind.c | 4 ++-- fs/hfs/btree.c | 2 +- fs/hfs/btree.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) Index: linux-2.6/fs/hfs/bfind.c =================================================================== --- linux-2.6.orig/fs/hfs/bfind.c +++ linux-2.6/fs/hfs/bfind.c @@ -23,7 +23,7 @@ int hfs_find_init(struct hfs_btree *tree 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 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; } Index: linux-2.6/fs/hfs/btree.c =================================================================== --- linux-2.6.orig/fs/hfs/btree.c +++ linux-2.6/fs/hfs/btree.c @@ -27,7 +27,7 @@ struct hfs_btree *hfs_btree_open(struct if (!tree) return NULL; - init_MUTEX(&tree->tree_lock); + mutex_init(&tree->tree_lock); spin_lock_init(&tree->hash_lock); /* Set the correct compare function */ tree->sb = sb; Index: linux-2.6/fs/hfs/btree.h =================================================================== --- linux-2.6.orig/fs/hfs/btree.h +++ linux-2.6/fs/hfs/btree.h @@ -33,7 +33,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;