diff options
-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
@@ -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 | */ |
241 | int expand_files(struct files_struct *files, int nr) | 241 | static 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 | ||
583 | int alloc_fd(unsigned start, unsigned flags) | 583 | static 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; | |||
73 | struct vfsmount; | 73 | struct vfsmount; |
74 | struct dentry; | 74 | struct dentry; |
75 | 75 | ||
76 | extern int expand_files(struct files_struct *, int nr); | ||
77 | extern void __init files_defer_init(void); | 76 | extern void __init files_defer_init(void); |
78 | 77 | ||
79 | static inline struct file * fcheck_files(struct files_struct *files, unsigned int fd) | 78 | 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); | |||
35 | extern void set_close_on_exec(unsigned int fd, int flag); | 35 | extern void set_close_on_exec(unsigned int fd, int flag); |
36 | extern bool get_close_on_exec(unsigned int fd); | 36 | extern bool get_close_on_exec(unsigned int fd); |
37 | extern void put_filp(struct file *); | 37 | extern void put_filp(struct file *); |
38 | extern int alloc_fd(unsigned start, unsigned flags); | ||
39 | extern int get_unused_fd_flags(unsigned flags); | 38 | extern 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) |
41 | extern void put_unused_fd(unsigned int fd); | 40 | extern void put_unused_fd(unsigned int fd); |