---

yaml --- r: 218364 b: refs/heads/master c: 72f98e7 h: refs/heads/master v: v3
git-mirror · Oct 27, 2010 · 08c8a3a · 08c8a3a
1 parent e0fe190
commit 08c8a3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7347ce4ee7c65415f84be915c018473e7076f31
+refs/heads/master: 72f98e72551fad573c6cace8e8551ef094f482dd
diff --git a/trunk/fs/Kconfig b/trunk/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/trunk/fs/locks.c b/trunk/fs/locks.c
@@ -142,20 +142,21 @@ 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
  * FIXME: should use a spinlock, once lockd and ceph are ready.
  */
 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);