Merge commit 'v2.6.36-rc7' into core/rcu

[mv-sheeva.git] / include / linux / fs.h

diff --git a/include/linux/fs.h b/include/linux/fs.h
index aa3dc8d20436dd8d4dbbd44016cd0a94be4051b0..3168dcfb94f2bedfa02fe42b7345055d3bb154e2 100644 (file)
--- 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