From 349d9fd3800b27fc34245bbffa6f1ac3065c4b04 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 21 Aug 2012 20:11:34 -0400
Subject: [PATCH] --- yaml --- r: 328979 b: refs/heads/master c:
 ad47bd7252bf402fe7dba92f5240b5ed16832ae7 h: refs/heads/master i:   328977:
 f5e9c029f9e60e5f3607e584ee2bc4ccc75a0ffe   328975:
 9f77a8dcfb1fcd6e0511fbcdac1c9641a51e25e4 v: v3

---
 [refs]                        | 2 +-
 trunk/fs/file.c               | 4 ++--
 trunk/include/linux/fdtable.h | 1 -
 trunk/include/linux/file.h    | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 09ff548e02b7..21dfcb7d291b 100644
--- 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
index 40ddef9fe041..967bd0dadbe5 100644
--- 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
index 9ff26319d44f..de2b71caa0f0 100644
--- 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
index 6239591a6122..6eee54aea279 100644
--- 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);