public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: next-20101022 broken with unset CONFIG_BKL
@ 2010-10-22  9:13 Sedat Dilek
  2010-10-22  9:24 ` Arnd Bergmann
  0 siblings, 1 reply; 6+ messages in thread
From: Sedat Dilek @ 2010-10-22  9:13 UTC (permalink / raw)
  To: LKML; +Cc: Arnd Bergmann, sfr

[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]

Hi,

I am trying to compile latest linux-next with unset CONFIG_BKL.
Yes, one patch is missing from [1] to be able to compile a BKL-free kernel.
(BTW, the patch needs a trivial fix, see v2 attached to this email.)

With next-20101022 the build breaks (sorry for the output in German):

[ build.log ]
...
  LD [M]  fs/ceph/ceph.o
  LD      fs/coda/built-in.o
  CC [M]  fs/coda/psdev.o
  CC [M]  fs/cifs/misc.o
/home/sd/src/linux-2.6/linux-2.6.36/debian/build/source_i386_none/fs/coda/psdev.c:
In function ‘coda_psdev_write’:
/home/sd/src/linux-2.6/linux-2.6.36/debian/build/source_i386_none/fs/coda/psdev.c:140:
error: implicit declaration of function ‘lock_kernel’
/home/sd/src/linux-2.6/linux-2.6.36/debian/build/source_i386_none/fs/coda/psdev.c:142:
error: implicit declaration of function ‘unlock_kernel’
  CC      block/blk-settings.o
make[6]: *** [fs/coda/psdev.o] Fehler 1
make[5]: *** [fs/coda] Fehler 2
make[5]: *** Warte auf noch nicht beendete Prozesse...
...

Just FYI.

Kind Regards,
- Sedat -

[1] https://patchwork.kernel.org/patch/262561/

[-- Attachment #2: fs-remove-BKL-from-FILE_LOCKING-v2.patch --]
[-- Type: text/plain, Size: 2155 bytes --]

From patchwork Mon Oct 18 17:38:26 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [v2] Remaining BKL users, what to do
Date: Mon, 18 Oct 2010 17:38:26 -0000
From: Arnd Bergmann <arnd@arndb.de>
X-Patchwork-Id: 262561
Message-Id: <201010181938.27076.arnd@arndb.de>
To: Christoph Hellwig <hch@infradead.org>
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>


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 # while lockd still uses it.
 	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);
 

^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2010-10-22 16:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-22  9:13 linux-next: next-20101022 broken with unset CONFIG_BKL Sedat Dilek
2010-10-22  9:24 ` Arnd Bergmann
2010-10-22  9:30   ` Sedat Dilek
2010-10-22  9:36     ` Arnd Bergmann
2010-10-22 11:34       ` Sedat Dilek
2010-10-22 16:03         ` Sedat Dilek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox