mtd/fs/jffs2 Makefile.common, 1.5, 1.6 compr.h, 1.5, 1.6 super-v24.c, 1.79, 1.80 super.c, 1.96, 1.97 proc.c, 1.3, NONE

[David Woodhouse]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv9395

Modified Files:
	Makefile.common compr.h super-v24.c super.c 
Removed Files:
	proc.c 
Log Message:
Remove proc support

Index: Makefile.common
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/Makefile.common,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Makefile.common	15 Jul 2004 16:06:41 -0000	1.5
+++ Makefile.common	16 Jul 2004 15:17:57 -0000	1.6
@@ -15,4 +15,3 @@
 jffs2-$(CONFIG_JFFS2_RUBIN)	+= compr_rubin.o
 jffs2-$(CONFIG_JFFS2_RTIME)	+= compr_rtime.o
 jffs2-$(CONFIG_JFFS2_ZLIB)	+= compr_zlib.o
-jffs2-$(CONFIG_JFFS2_PROC)	+= proc.o

Index: compr.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- compr.h	23 Jun 2004 16:34:39 -0000	1.5
+++ compr.h	16 Jul 2004 15:17:57 -0000	1.6
@@ -115,8 +115,4 @@
 void jffs2_lzo_exit(void);
 #endif
 
-/* Prototypes from proc.c */
-int jffs2_proc_init(void);
-int jffs2_proc_exit(void);
-
 #endif /* __JFFS2_COMPR_H__ */

Index: super-v24.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/super-v24.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- super-v24.c	25 May 2004 11:25:25 -0000	1.79
+++ super-v24.c	16 Jul 2004 15:17:57 -0000	1.80
@@ -126,13 +126,6 @@
 		return -EIO;
 	}
 #endif
-#ifdef CONFIG_JFFS2_PROC
-	ret = jffs2_proc_init();
-	if (ret) {
-		printk(KERN_ERR "JFFS2 error: Failed to initialise proc interface\n");
-		goto out;
-	}
-#endif
 	ret = jffs2_compressors_init();
 	if (ret) {
 		printk(KERN_ERR "JFFS2 error: Failed to initialise compressors\n");
@@ -154,9 +147,6 @@
 	jffs2_destroy_slab_caches();
  out_compressors:
 	jffs2_compressors_exit();
-#ifdef CONFIG_JFFS2_PROC
-        jffs2_proc_exit();
-#endif
  out:
 	return ret;
 }
@@ -165,9 +155,6 @@
 {
 	jffs2_destroy_slab_caches();
 	jffs2_compressors_exit();
-#ifdef CONFIG_JFFS2_PROC
-        jffs2_proc_exit();
-#endif
 	unregister_filesystem(&jffs2_fs_type);
 }
 

Index: super.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/super.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- super.c	13 Jul 2004 08:57:30 -0000	1.96
+++ super.c	16 Jul 2004 15:17:57 -0000	1.97
@@ -308,13 +308,6 @@
 		printk(KERN_ERR "JFFS2 error: Failed to initialise inode cache\n");
 		return -ENOMEM;
 	}
-#ifdef CONFIG_JFFS2_PROC
-	ret = jffs2_proc_init();
-	if (ret) {
-		printk(KERN_ERR "JFFS2 error: Failed to initialise proc interface\n");
-		goto out;
-	}
-#endif
 	ret = jffs2_compressors_init();
 	if (ret) {
 		printk(KERN_ERR "JFFS2 error: Failed to initialise compressors\n");
@@ -336,9 +329,6 @@
 	jffs2_destroy_slab_caches();
  out_compressors:
 	jffs2_compressors_exit();
-#ifdef CONFIG_JFFS2_PROC
-        jffs2_proc_exit();
-#endif
  out:
 	return ret;
 }
@@ -348,9 +338,6 @@
 	unregister_filesystem(&jffs2_fs_type);
 	jffs2_destroy_slab_caches();
 	jffs2_compressors_exit();
-#ifdef CONFIG_JFFS2_PROC
-        jffs2_proc_exit();
-#endif
 	kmem_cache_destroy(jffs2_inode_cachep);
 }
 

--- proc.c DELETED ---