From 4f21a967a59b5e6b5439bd0235b8302b238a3b53 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 21 Sep 2010 14:35:37 -0700
Subject: [PATCH] --- yaml --- r: 210888 b: refs/heads/master c:
 8b15575cae7a93a784c3005c42b069edd9ba64dd h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/fs.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6ef5cbfd8cec..5da65e0feb48 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ce1e41c1b61a992077bd1c45c6c3fd6a8b10c02
+refs/heads/master: 8b15575cae7a93a784c3005c42b069edd9ba64dd
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 76041b614758..63d069bd80b7 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/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