[2.6 patch] remove fs/jffs2/ioctl.c

[Adrian Bunk]

fs/jffs2/ioctl.c is already for so long in the "might be used later"=20
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 <***@stusta.de>

---

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(-)

--- linux-2.6.14-rc5-mm1-full/fs/jffs2/os-linux.h.old 2005-11-01 20:28:=
24.000000000 +0100
+++ linux-2.6.14-rc5-mm1-full/fs/jffs2/os-linux.h 2005-11-01 20:28:31.0=
00000000 +0100
@@ -147,9 +147,6 @@
int jffs2_fsync(struct file *, struct dentry *, int);
int jffs2_do_readpage_unlock (struct inode *inode, struct page *pg);
=20
-/* ioctl.c */
-int jffs2_ioctl(struct inode *, struct file *, unsigned int, unsigned =
long);
-
/* symlink.c */
extern struct inode_operations jffs2_symlink_inode_operations;
=20
--- linux-2.6.14-rc5-mm1-full/fs/jffs2/dir.c.old 2005-11-01 20:28:39.00=
0000000 +0100
+++ linux-2.6.14-rc5-mm1-full/fs/jffs2/dir.c 2005-11-01 20:28:43.000000=
000 +0100
@@ -41,7 +41,6 @@
{
.read =3D generic_read_dir,
.readdir =3D jffs2_readdir,
- .ioctl =3D jffs2_ioctl,
.fsync =3D jffs2_fsync
};
=20
--- linux-2.6.14-rc5-mm1-full/fs/jffs2/Makefile.old 2005-11-01 20:31:23=
=2E000000000 +0100
+++ linux-2.6.14-rc5-mm1-full/fs/jffs2/Makefile 2005-11-01 20:31:41.000=
000000 +0100
@@ -6,7 +6,7 @@
=20
obj-$(CONFIG_JFFS2_FS) +=3D jffs2.o
=20
-jffs2-y :=3D compr.o dir.o file.o ioctl.o nodelist.o malloc.o
+jffs2-y :=3D compr.o dir.o file.o nodelist.o malloc.o
jffs2-y +=3D read.o nodemgmt.o readinode.o write.o scan.o gc.o
jffs2-y +=3D symlink.o build.o erase.o background.o fs.o writev.o
jffs2-y +=3D super.o
--- linux-2.6.19-rc6-mm1/fs/jffs2/file.c.old 2006-11-26 05:55:29.000000=
000 +0100
+++ linux-2.6.19-rc6-mm1/fs/jffs2/file.c 2006-11-26 05:53:06.000000000 =
+0100
@@ -46,5 +46,4 @@
.write =3D do_sync_write,
.aio_write =3D generic_file_aio_write,
- .ioctl =3D jffs2_ioctl,
.mmap =3D generic_file_readonly_mmap,
.fsync =3D jffs2_fsync,

--- linux-2.6.23-rc1-mm1/fs/jffs2/ioctl.c 2007-07-09 01:32:17.000000000=
+0200
+++ /dev/null 2006-09-19 00:45:31.000000000 +0200
@@ -1,21 +0,0 @@
-/*
- * JFFS2 -- Journalling Flash File System, Version 2.
- *
- * Copyright =C2=A9 2001-2007 Red Hat, Inc.
- *
- * Created by David Woodhouse <***@infradead.org>
- *
- * For licensing information, see the file 'LICENCE' in this directory=
=2E
- *
- */
-
-#include <linux/fs.h>
-
-int jffs2_ioctl(struct inode *inode, struct file *filp, unsigned int c=
md,
- unsigned long arg)
-{
- /* Later, this will provide for lsattr.jffs2 and chattr.jffs2, which
- will include compression support etc. */
- return -ENOTTY;
-}
-