From: Adrian Bunk <bunk@kernel.org>

Make the needlessly global vfs_ioctl() static.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/ioctl.c         |    4 ++--
 include/linux/fs.h |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff -puN fs/ioctl.c~make-vfs_ioctl-static fs/ioctl.c
--- a/fs/ioctl.c~make-vfs_ioctl-static
+++ a/fs/ioctl.c
@@ -28,8 +28,8 @@
  *
  * Returns 0 on success, -errno on error.
  */
-long vfs_ioctl(struct file *filp, unsigned int cmd,
-	       unsigned long arg)
+static long vfs_ioctl(struct file *filp, unsigned int cmd,
+		      unsigned long arg)
 {
 	int error = -ENOTTY;
 
diff -puN include/linux/fs.h~make-vfs_ioctl-static include/linux/fs.h
--- a/include/linux/fs.h~make-vfs_ioctl-static
+++ a/include/linux/fs.h
@@ -1919,7 +1919,6 @@ extern int vfs_stat_fd(int dfd, char __u
 extern int vfs_lstat_fd(int dfd, char __user *, struct kstat *);
 extern int vfs_fstat(unsigned int, struct kstat *);
 
-extern long vfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
 extern int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd,
 		    unsigned long arg);
 
_