aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2010-09-21 14:35:37 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-21 17:27:44 -0700
commit8b15575cae7a93a784c3005c42b069edd9ba64dd (patch)
treecd1fd3c10b724e9ebe1c583e6b21b249dcc95671
parent1ce1e41c1b61a992077bd1c45c6c3fd6a8b10c02 (diff)
downloadmrst-s0i3-test-8b15575cae7a93a784c3005c42b069edd9ba64dd.tar.gz
mrst-s0i3-test-8b15575cae7a93a784c3005c42b069edd9ba64dd.tar.xz
mrst-s0i3-test-8b15575cae7a93a784c3005c42b069edd9ba64dd.zip
fs: {lock,unlock}_flocks() stubs to prepare for BKL removal
The lock structs are currently protected by the BKL, but are accessed by code in fs/locks.c and misc file system and DLM code. These stubs will allow all users to switch to the new interface before the implementation is changed to a spinlock. Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Sage Weil <sage@newdream.net> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/fs.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 76041b61475..63d069bd80b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1093,6 +1093,10 @@ struct file_lock {
#include <linux/fcntl.h>
+/* temporary stubs for BKL removal */
+#define lock_flocks() lock_kernel()
+#define unlock_flocks() unlock_kernel()
+
extern void send_sigio(struct fown_struct *fown, int fd, int band);
#ifdef CONFIG_FILE_LOCKING