aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs.h
diff options
context:
space:
mode:
authorNick Piggin <npiggin@kernel.dk>2010-08-17 14:37:35 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-08-18 08:35:47 -0400
commitee2ffa0dfdd2db19705f2ba1c6a4c0bfe8122dd8 (patch)
treee48400d1a33f8d2e68589ccfd61637aa64462f08 /include/linux/fs.h
parentb04f784e5d19ed58892833dae845738972cea260 (diff)
fs: cleanup files_lock locking
fs: cleanup files_lock locking Lock tty_files with a new spinlock, tty_files_lock; provide helpers to manipulate the per-sb files list; unexport the files_lock spinlock. Cc: linux-kernel@vger.kernel.org Cc: Christoph Hellwig <hch@infradead.org> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Acked-by: Andi Kleen <ak@linux.intel.com> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Nick Piggin <npiggin@kernel.dk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include/linux/fs.h')
-rw-r--r--include/linux/fs.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 29f7c975304c..5a9a9e5a3705 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -944,9 +944,6 @@ struct file {
944 unsigned long f_mnt_write_state; 944 unsigned long f_mnt_write_state;
945#endif 945#endif
946}; 946};
947extern spinlock_t files_lock;
948#define file_list_lock() spin_lock(&files_lock);
949#define file_list_unlock() spin_unlock(&files_lock);
950 947
951#define get_file(x) atomic_long_inc(&(x)->f_count) 948#define get_file(x) atomic_long_inc(&(x)->f_count)
952#define fput_atomic(x) atomic_long_add_unless(&(x)->f_count, -1, 1) 949#define fput_atomic(x) atomic_long_add_unless(&(x)->f_count, -1, 1)
@@ -2188,8 +2185,8 @@ static inline void insert_inode_hash(struct inode *inode) {
2188 __insert_inode_hash(inode, inode->i_ino); 2185 __insert_inode_hash(inode, inode->i_ino);
2189} 2186}
2190 2187
2191extern void file_move(struct file *f, struct list_head *list); 2188extern void file_sb_list_add(struct file *f, struct super_block *sb);
2192extern void file_kill(struct file *f); 2189extern void file_sb_list_del(struct file *f);
2193#ifdef CONFIG_BLOCK 2190#ifdef CONFIG_BLOCK
2194extern void submit_bio(int, struct bio *); 2191extern void submit_bio(int, struct bio *);
2195extern int bdev_read_only(struct block_device *); 2192extern int bdev_read_only(struct block_device *);