aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2009-12-04 15:47:36 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2009-12-16 12:16:45 -0500
commite81e3f4dca6c54116a24aec217d2c15c6f58ada5 (patch)
tree4cbaf8b4573a4f4dac2dafc2bebffe398a984b3d
parentb75b5086be6504132eadb22a907854e0bf52e365 (diff)
fs: move get_empty_filp() deffinition to internal.h
All users outside of fs/ of get_empty_filp() have been removed. This patch moves the definition from the include/ directory to internal.h so no new users crop up and removes the EXPORT_SYMBOL. I'd love to see open intents stop using it too, but that's a problem for another day and a smarter developer! Signed-off-by: Eric Paris <eparis@redhat.com> Acked-by: Miklos Szeredi <miklos@szeredi.hu> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/file_table.c2
-rw-r--r--fs/internal.h1
-rw-r--r--fs/namei.c2
-rw-r--r--fs/open.c2
-rw-r--r--include/linux/fs.h1
5 files changed, 7 insertions, 1 deletions
diff --git a/fs/file_table.c b/fs/file_table.c
index 163cd28314e0..361d76be8295 100644
--- a/fs/file_table.c
+++ b/fs/file_table.c
@@ -24,6 +24,8 @@
24 24
25#include <asm/atomic.h> 25#include <asm/atomic.h>
26 26
27#include "internal.h"
28
27/* sysctl tunables... */ 29/* sysctl tunables... */
28struct files_stat_struct files_stat = { 30struct files_stat_struct files_stat = {
29 .max_files = NR_FILE 31 .max_files = NR_FILE
diff --git a/fs/internal.h b/fs/internal.h
index 515175b8b72e..f67cd141d9a8 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -79,6 +79,7 @@ extern void chroot_fs_refs(struct path *, struct path *);
79 * file_table.c 79 * file_table.c
80 */ 80 */
81extern void mark_files_ro(struct super_block *); 81extern void mark_files_ro(struct super_block *);
82extern struct file *get_empty_filp(void);
82 83
83/* 84/*
84 * super.c 85 * super.c
diff --git a/fs/namei.c b/fs/namei.c
index 8c8b379b94a4..1fc038b117be 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -35,6 +35,8 @@
35#include <linux/fs_struct.h> 35#include <linux/fs_struct.h>
36#include <asm/uaccess.h> 36#include <asm/uaccess.h>
37 37
38#include "internal.h"
39
38#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE]) 40#define ACC_MODE(x) ("\000\004\002\006"[(x)&O_ACCMODE])
39 41
40/* [Feb-1997 T. Schoebel-Theuer] 42/* [Feb-1997 T. Schoebel-Theuer]
diff --git a/fs/open.c b/fs/open.c
index b4b31d277f3a..d95651e8be9e 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -31,6 +31,8 @@
31#include <linux/falloc.h> 31#include <linux/falloc.h>
32#include <linux/fs_struct.h> 32#include <linux/fs_struct.h>
33 33
34#include "internal.h"
35
34int vfs_statfs(struct dentry *dentry, struct kstatfs *buf) 36int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
35{ 37{
36 int retval = -ENODEV; 38 int retval = -ENODEV;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index a057f48eb156..cdc23be4edde 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2189,7 +2189,6 @@ static inline void insert_inode_hash(struct inode *inode) {
2189 __insert_inode_hash(inode, inode->i_ino); 2189 __insert_inode_hash(inode, inode->i_ino);
2190} 2190}
2191 2191
2192extern struct file * get_empty_filp(void);
2193extern void file_move(struct file *f, struct list_head *list); 2192extern void file_move(struct file *f, struct list_head *list);
2194extern void file_kill(struct file *f); 2193extern void file_kill(struct file *f);
2195#ifdef CONFIG_BLOCK 2194#ifdef CONFIG_BLOCK