From patchwork Mon Oct 18 17:38:26 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Arnd Bergmann <arnd@arndb.de>
X-Patchwork-Id: 262571
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9IHdjeH018756
	for <patchwork-media@patchwork.kernel.org>;
	Mon, 18 Oct 2010 17:39:45 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1757449Ab0JRRi5 (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Mon, 18 Oct 2010 13:38:57 -0400
Received: from moutng.kundenserver.de ([212.227.126.171]:56700 "EHLO
	moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755465Ab0JRRi4 (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Mon, 18 Oct 2010 13:38:56 -0400
Received: from wuerfel.localnet (port-92-200-213-9.dynamic.qsc.de
	[92.200.213.9])
	by mrelayeu.kundenserver.de (node=mreu1) with ESMTP (Nemesis)
	id 0Ltj2f-1OgdYB0YUP-011g6F; Mon, 18 Oct 2010 19:38:30 +0200
From: Arnd Bergmann <arnd@arndb.de>
To: Christoph Hellwig <hch@infradead.org>
Subject: Re: [v2] Remaining BKL users, what to do
Date: Mon, 18 Oct 2010 19:38:26 +0200
User-Agent: KMail/1.13.5 (Linux/2.6.36-rc7-next-20101015+; KDE/4.5.1; x86_64;
	; )
Cc: codalist@TELEMANN.coda.cs.cmu.edu,
	ksummit-2010-discuss@lists.linux-foundation.org,
	autofs@linux.kernel.org, linux-media@vger.kernel.org,
	dri-devel@lists.freedesktop.org,
	Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>,
	Trond Myklebust <Trond.Myklebust@netapp.com>,
	Petr Vandrovec <vandrove@vc.cvut.cz>, Anders Larsen <al@alarsen.net>,
	Jan Kara <jack@suse.cz>, Evgeniy Dushistov <dushistov@mail.ru>,
	Ingo Molnar <mingo@elte.hu>, netdev@vger.kernel.org,
	Samuel Ortiz <samuel@sortiz.org>,
	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>,
	linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	Andrew Hendry <andrew.hendry@gmail.com>,
	David Miller <davem@davemloft.net>, Jan Harkes <jaharkes@cs.cmu.edu>,
	Bryan Schumaker <bjschuma@netapp.com>
References: <201009161632.59210.arnd@arndb.de>
	<201010181742.06678.arnd@arndb.de>
	<20101018161924.GA9571@infradead.org>
In-Reply-To: <20101018161924.GA9571@infradead.org>
MIME-Version: 1.0
Message-Id: <201010181938.27076.arnd@arndb.de>
X-Provags-ID: V02:K0:ntn3C7G5536uH5rgMWnLdKqpiPdBxRsP95JcLNhdKR0
	Mr4WWEUStt1l8CIvFYSQjcsm/+vNPLqJRwjl2kFNI/qPkebifK
	BwEO6ynWsbcWJVr+7NByMEQHgFHhEtyBY1bvICfRgKBLXm0nz2
	XgX4HRBk8bxvuqKEKRGuWODo8U89Zvn6RJ6wwjxAuHZSlycen2
	1+fwyeEruNbjC1ex5HY3g==
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Mon, 18 Oct 2010 17:39:46 +0000 (UTC)


diff --git a/fs/Kconfig b/fs/Kconfig
index c386a9f..25ce2dc 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -50,7 +50,6 @@ endif # BLOCK
 config FILE_LOCKING
 	bool "Enable POSIX file locking API" if EMBEDDED
 	default y
-	select BKL
 	help
 	  This option enables standard file locking support, required
           for filesystems like NFS and for the flock() system
diff --git a/fs/locks.c b/fs/locks.c
index 8b2b6ad..02b6e0e 100644
--- a/fs/locks.c
+++ b/fs/locks.c
@@ -142,6 +142,7 @@ int lease_break_time = 45;
 
 static LIST_HEAD(file_lock_list);
 static LIST_HEAD(blocked_list);
+static DEFINE_SPINLOCK(file_lock_lock);
 
 /*
  * Protects the two list heads above, plus the inode->i_flock list
@@ -149,13 +150,13 @@ static LIST_HEAD(blocked_list);
  */
 void lock_flocks(void)
 {
-	lock_kernel();
+	spin_lock(&file_lock_lock);
 }
 EXPORT_SYMBOL_GPL(lock_flocks);
 
 void unlock_flocks(void)
 {
-	unlock_kernel();
+	spin_unlock(&file_lock_lock);
 }
 EXPORT_SYMBOL_GPL(unlock_flocks);