From: Adrian Bunk There doesn't seem to be any reason for keeping fs/jffs2/ioctl.c . 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 | 23 ----------------------- fs/jffs2/os-linux.h | 3 --- 5 files changed, 1 insertion(+), 29 deletions(-) diff -puN fs/jffs2/dir.c~remove-fs-jffs2-ioctlc fs/jffs2/dir.c --- devel/fs/jffs2/dir.c~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700 +++ devel-akpm/fs/jffs2/dir.c 2006-05-19 16:00:38.000000000 -0700 @@ -41,7 +41,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 --- devel/fs/jffs2/file.c~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700 +++ devel-akpm/fs/jffs2/file.c 2006-05-19 16:00:38.000000000 -0700 @@ -44,7 +44,6 @@ const struct file_operations jffs2_file_ .open = generic_file_open, .read = generic_file_read, .write = generic_file_write, - .ioctl = jffs2_ioctl, .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .sendfile = generic_file_sendfile diff -L fs/jffs2/ioctl.c -puN fs/jffs2/ioctl.c~remove-fs-jffs2-ioctlc /dev/null --- devel/fs/jffs2/ioctl.c +++ /dev/null 2006-05-19 15:26:20.261540500 -0700 @@ -1,23 +0,0 @@ -/* - * JFFS2 -- Journalling Flash File System, Version 2. - * - * Copyright (C) 2001-2003 Red Hat, Inc. - * - * Created by David Woodhouse - * - * For licensing information, see the file 'LICENCE' in this directory. - * - * $Id: ioctl.c,v 1.10 2005/11/07 11:14:40 gleixner Exp $ - * - */ - -#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/Makefile~remove-fs-jffs2-ioctlc fs/jffs2/Makefile --- devel/fs/jffs2/Makefile~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700 +++ devel-akpm/fs/jffs2/Makefile 2006-05-19 16:00:38.000000000 -0700 @@ -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 debug.o diff -puN fs/jffs2/os-linux.h~remove-fs-jffs2-ioctlc fs/jffs2/os-linux.h --- devel/fs/jffs2/os-linux.h~remove-fs-jffs2-ioctlc 2006-05-19 16:00:38.000000000 -0700 +++ devel-akpm/fs/jffs2/os-linux.h 2006-05-19 16:00:38.000000000 -0700 @@ -167,9 +167,6 @@ extern struct address_space_operations j 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; _