---

yaml --- r: 328979 b: refs/heads/master c: ad47bd7 h: refs/heads/master i: 328977: f5e9c02 328975: 9f77a8d v: v3
git-mirror · Sep 27, 2012 · 349d9fd · 349d9fd
1 parent ead0d62
commit 349d9fd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b8318b01a8f7f760ae3ecae052ccc7fc123d9508
+refs/heads/master: ad47bd7252bf402fe7dba92f5240b5ed16832ae7
diff --git a/trunk/fs/file.c b/trunk/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 @@ int __alloc_fd(struct files_struct *files,
 	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/trunk/include/linux/fdtable.h b/trunk/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/trunk/include/linux/file.h b/trunk/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);