diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-08-21 20:11:34 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-26 21:09:58 -0400 |
| commit | ad47bd7252bf402fe7dba92f5240b5ed16832ae7 (patch) | |
| tree | 1d55eb5934e66b18f7fb7205a9626678975c577a | |
| parent | b8318b01a8f7f760ae3ecae052ccc7fc123d9508 (diff) | |
| download | linux-ad47bd7252bf402fe7dba92f5240b5ed16832ae7.tar.gz linux-ad47bd7252bf402fe7dba92f5240b5ed16832ae7.tar.bz2 linux-ad47bd7252bf402fe7dba92f5240b5ed16832ae7.zip | |
make expand_files() and alloc_fd() static
no callers outside of fs/file.c left
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | fs/file.c | 4 | ||||
| -rw-r--r-- | include/linux/fdtable.h | 1 | ||||
| -rw-r--r-- | include/linux/file.h | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/fs/file.c b/fs/file.c index 40ddef9fe041..967bd0dadbe5 100644 --- a/fs/file.c +++ b/fs/file.c @@ -238,7 +238,7 @@ static int expand_fdtable(struct files_struct *files, int nr) * expanded and execution may have blocked. * The files->file_lock should be held on entry, and will be held on exit. */ -int expand_files(struct files_struct *files, int nr) +static int expand_files(struct files_struct *files, int nr) { struct fdtable *fdt; @@ -580,7 +580,7 @@ out: return error; } -int alloc_fd(unsigned start, unsigned flags) +static int alloc_fd(unsigned start, unsigned flags) { return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags); } diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h index 9ff26319d44f..de2b71caa0f0 100644 --- a/include/linux/fdtable.h +++ b/include/linux/fdtable.h @@ -73,7 +73,6 @@ struct file_operations; struct vfsmount; struct dentry; -extern int expand_files(struct files_struct *, int nr); extern void __init files_defer_init(void); static inline struct file * fcheck_files(struct files_struct *files, unsigned int fd) diff --git a/include/linux/file.h b/include/linux/file.h index 6239591a6122..6eee54aea279 100644 --- a/include/linux/file.h +++ b/include/linux/file.h @@ -35,7 +35,6 @@ extern int replace_fd(unsigned fd, struct file *file, unsigned flags); extern void set_close_on_exec(unsigned int fd, int flag); extern bool get_close_on_exec(unsigned int fd); extern void put_filp(struct file *); -extern int alloc_fd(unsigned start, unsigned flags); extern int get_unused_fd_flags(unsigned flags); #define get_unused_fd() get_unused_fd_flags(0) extern void put_unused_fd(unsigned int fd); |