remove fs/jffs2/ioctl.c
PATCH 1/1 remove fs/jffs2/ioctl.c
fs/jffs2/ioctl.c is already for so long in the "might be used later" state that I doubt it will ever be actually used...
And if it will ever be used, reverting this patch will be trivial.
Signed-off-by Adrian Bunk <[email protected]>
---
fs/jffs2/Makefile | 2 +- fs/jffs2/dir.c | 1 - fs/jffs2/file.c | 1 - fs/jffs2/ioctl.c | 21 --------------------- fs/jffs2/os-linux.h | 3 --- 5 files changed, 1 insertion(+), 27 deletions(-)
fs/jffs2/os-linux.h renamed from fs/jffs2/os-linux.h.old +0 -3
@@ -147,9 +147,6 @@int jffs2_fsync (struct file *,struct dentry *,int );int jffs2_do_readpage_unlock (struct inode *inode,struct page *pg); -/* ioctl.c */ -int jffs2_ioctl (struct inode *,struct file *,unsigned int ,unsigned long ); -/* symlink.c */ extern struct inode_operations jffs2_symlink_inode_operations;
fs/jffs2/dir.c renamed from fs/jffs2/dir.c.old +0 -1
@@ -41,7 +41,6 @@ { .read = generic_read_dir, .readdir = jffs2_readdir, - .ioctl = jffs2_ioctl, .fsync = jffs2_fsync };
fs/jffs2/Makefile renamed from fs/jffs2/Makefile.old +1 -1
@@ -6,7 +6,7 @@ obj-$(CONFIG_JFFS2_FS) += jffs2.o -jffs2-y := compr.o dir.o file.o ioctl.o nodelist.o malloc.o +jffs2-y := compr.o dir.o file.o nodelist.o malloc.o jffs2-y += read.o nodemgmt.o readinode.o write.o scan.o gc.o jffs2-y += symlink.o build.o erase.o background.o fs.o writev.o jffs2-y += super.o
fs/jffs2/file.c renamed from fs/jffs2/file.c.old +0 -1
@@ -46,5 +46,4 @@ .write = do_sync_write, .aio_write = generic_file_aio_write, - .ioctl = jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync,
fs/jffs2/ioctl.c deleted +0 -21
@@ -1,21 +0,0 @@ -/* -* JFFS2 -- Journalling Flash File System, Version 2. -* -* Copyright © 2001-2007 Red Hat, Inc. -* -* Created by David Woodhouse <[email protected]> -* -* For licensing information, see the file 'LICENCE' in this directory. -* -*/ - -#include <linux/fs.h> - -int jffs2_ioctl (struct inode *inode,struct file *filp,unsigned int cmd, -unsigned long arg) -{ -/* Later, this will provide for lsattr.jffs2 and chattr.jffs2, which -will include compression support etc. */ -return -ENOTTY ; -} -