locks: turn lock_flocks into a spinlock

arndb · arndb · commit 72f98e72551f · 2010-10-27T22:07:36.000+02:00
Nothing depends on lock_flocks using the BKL
any more, so we can do the switch over to
a private spinlock.

Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
diff --git 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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -142,20 +142,21 @@ int lease_break_time = 45;`
`142`	`142`
`143`	`143`	`static LIST_HEAD(file_lock_list);`
`144`	`144`	`static LIST_HEAD(blocked_list);`
	`145`	`+static DEFINE_SPINLOCK(file_lock_lock);`
`145`	`146`
`146`	`147`	`/*`
`147`	`148`	`* Protects the two list heads above, plus the inode->i_flock list`
`148`	`149`	`* FIXME: should use a spinlock, once lockd and ceph are ready.`
`149`	`150`	`*/`
`150`	`151`	`void lock_flocks(void)`
`151`	`152`	`{`
`152`		`- lock_kernel();`
	`153`	`+ spin_lock(&file_lock_lock);`
`153`	`154`	`}`
`154`	`155`	`EXPORT_SYMBOL_GPL(lock_flocks);`
`155`	`156`
`156`	`157`	`void unlock_flocks(void)`
`157`	`158`	`{`
`158`		`- unlock_kernel();`
	`159`	`+ spin_unlock(&file_lock_lock);`
`159`	`160`	`}`
`160`	`161`	`EXPORT_SYMBOL_GPL(unlock_flocks);`
`161`	`162`