[<prev] [next>] [day] [month] [year] [list]
Message-ID: <Pine.LNX.4.64.1009211438010.18094@cobra.newdream.net>
Date: Tue, 21 Sep 2010 16:24:37 -0700 (PDT)
From: Sage Weil <sage@...dream.net>
To: torvalds@...ux-foundation.org
cc: Arnd Bergmann <arnd@...db.de>,
Stephen Rothwell <sfr@...b.auug.org.au>,
linux-kernel@...r.kernel.org,
Matthew Wilcox <willy@...ux.intel.com>,
Christoph Hellwig <hch@....de>,
Trond Myklebust <trond.myklebust@....uio.no>,
"J. Bruce Fields" <bfields@...ldses.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Miklos Szeredi <mszeredi@...e.cz>,
Frederic Weisbecker <fweisbec@...il.com>,
Ingo Molnar <mingo@...hat.com>, John Kacur <jkacur@...hat.com>,
linux-fsdevel@...r.kernel.org, gregf@...newdream.net
Subject: [PATCH] fs: {lock,unlock}_flocks() stubs to prepare for BKL removal
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@...dream.net>
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@...db.de>
Signed-off-by: Sage Weil <sage@...dream.net>
---
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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists