Hi Linus,
The locking for fs/locks.c will be switching to a new interface in
preparation for BKL removal. Getting these stubs upstream prior to the
merge window will make it a bit easier for subsystems to make the
necessary changes (non-trivial, in Ceph's case), test in linux-next
without conflicts, and avoid worrying about the order in which things are
pulled for 2.6.37.
Would you mind taking the patch below now?
Thanks!
sage
---
From: Sage Weil <sage@xxxxxxxxxxxx>
Date: Tue, 21 Sep 2010 14:35:37 -0700
Subject: [PATCH] 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@xxxxxxxx>
Signed-off-by: Sage Weil <sage@xxxxxxxxxxxx>
---
include/linux/fs.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 76041b6..63d069b 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
--
1.7.0
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
