Skip to content

Commit

Permalink
fs: {lock,unlock}_flocks() stubs to prepare for BKL removal
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sage Weil authored and Linus Torvalds committed Sep 22, 2010
1 parent 1ce1e41 commit 8b15575
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions include/linux/fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8b15575

Please sign in to comment.