From: Adrian Bunk 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 Cc: David Woodhouse Signed-off-by: Andrew Morton --- 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(-) diff -puN fs/jffs2/Makefile~remove-fs-jffs2-ioctlc fs/jffs2/Makefile --- a/fs/jffs2/Makefile~remove-fs-jffs2-ioctlc +++ a/fs/jffs2/Makefile @@ -5,7 +5,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 debug.o diff -puN fs/jffs2/dir.c~remove-fs-jffs2-ioctlc fs/jffs2/dir.c --- a/fs/jffs2/dir.c~remove-fs-jffs2-ioctlc +++ a/fs/jffs2/dir.c @@ -38,7 +38,6 @@ const struct file_operations jffs2_dir_o { .read = generic_read_dir, .readdir = jffs2_readdir, - .ioctl = jffs2_ioctl, .fsync = jffs2_fsync }; diff -puN fs/jffs2/file.c~remove-fs-jffs2-ioctlc fs/jffs2/file.c --- a/fs/jffs2/file.c~remove-fs-jffs2-ioctlc +++ a/fs/jffs2/file.c @@ -44,7 +44,6 @@ const struct file_operations jffs2_file_ .aio_read = generic_file_aio_read, .write = do_sync_write, .aio_write = generic_file_aio_write, - .ioctl = jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .splice_read = generic_file_splice_read, diff -puN fs/jffs2/ioctl.c~remove-fs-jffs2-ioctlc /dev/null --- a/fs/jffs2/ioctl.c +++ /dev/null @@ -1,21 +0,0 @@ -/* - * JFFS2 -- Journalling Flash File System, Version 2. - * - * Copyright © 2001-2007 Red Hat, Inc. - * - * Created by David Woodhouse - * - * For licensing information, see the file 'LICENCE' in this directory. - * - */ - -#include - -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; -} - diff -puN fs/jffs2/os-linux.h~remove-fs-jffs2-ioctlc fs/jffs2/os-linux.h --- a/fs/jffs2/os-linux.h~remove-fs-jffs2-ioctlc +++ a/fs/jffs2/os-linux.h @@ -166,9 +166,6 @@ extern const struct address_space_operat 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 const struct inode_operations jffs2_symlink_inode_operations; _