aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/file.c4
-rw-r--r--include/linux/fdtable.h1
-rw-r--r--include/linux/file.h1
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)
238 * expanded and execution may have blocked. 238 * expanded and execution may have blocked.
239 * The files->file_lock should be held on entry, and will be held on exit. 239 * The files->file_lock should be held on entry, and will be held on exit.
240 */ 240 */
241int expand_files(struct files_struct *files, int nr) 241static int expand_files(struct files_struct *files, int nr)
242{ 242{
243 struct fdtable *fdt; 243 struct fdtable *fdt;
244 244
@@ -580,7 +580,7 @@ out:
580 return error; 580 return error;
581} 581}
582 582
583int alloc_fd(unsigned start, unsigned flags) 583static int alloc_fd(unsigned start, unsigned flags)
584{ 584{
585 return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags); 585 return __alloc_fd(current->files, start, rlimit(RLIMIT_NOFILE), flags);
586} 586}
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;
73struct vfsmount; 73struct vfsmount;
74struct dentry; 74struct dentry;
75 75
76extern int expand_files(struct files_struct *, int nr);
77extern void __init files_defer_init(void); 76extern void __init files_defer_init(void);
78 77
79static inline struct file * fcheck_files(struct files_struct *files, unsigned int fd) 78static 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);
35extern void set_close_on_exec(unsigned int fd, int flag); 35extern void set_close_on_exec(unsigned int fd, int flag);
36extern bool get_close_on_exec(unsigned int fd); 36extern bool get_close_on_exec(unsigned int fd);
37extern void put_filp(struct file *); 37extern void put_filp(struct file *);
38extern int alloc_fd(unsigned start, unsigned flags);
39extern int get_unused_fd_flags(unsigned flags); 38extern int get_unused_fd_flags(unsigned flags);
40#define get_unused_fd() get_unused_fd_flags(0) 39#define get_unused_fd() get_unused_fd_flags(0)
41extern void put_unused_fd(unsigned int fd); 40extern void put_unused_fd(unsigned int fd);