mtd/fs/jffs2 compr.c, 1.43, 1.44 compr.h, 1.6, 1.7 compr_rtime.c,
1.14, 1.15 erase.c, 1.72, 1.73 file.c, 1.99, 1.100 fs.c, 1.53,
1.54 nodelist.h, 1.128, 1.129 os-linux.h, 1.54, 1.55 wbuf.c,
1.89, 1.90
gleixner at infradead.org
gleixner at infradead.org
Thu Mar 17 15:23:10 EST 2005
Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv26559
Modified Files:
compr.c compr.h compr_rtime.c erase.c file.c fs.c nodelist.h
os-linux.h wbuf.c
Log Message:
Merge from mainstream.
[PATCH] fs/jffs2/: misc cleanups
This patch contains the following cleanups:
- make some needlessly global functions static
- remove the following unused global functions:
- compr.c: jffs2_set_compression_mode
- compr.c: jffs2_get_compression_mode
Signed-off-by: Adrian Bunk <bunk at stusta.de>
Index: compr.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- compr.c 12 Jan 2005 22:34:35 -0000 1.43
+++ compr.c 17 Mar 2005 20:23:06 -0000 1.44
@@ -23,16 +23,6 @@
/* Actual compression mode */
static int jffs2_compression_mode = JFFS2_COMPR_MODE_PRIORITY;
-void jffs2_set_compression_mode(int mode)
-{
- jffs2_compression_mode = mode;
-}
-
-int jffs2_get_compression_mode(void)
-{
- return jffs2_compression_mode;
-}
-
/* Statistics for blocks stored without compression */
static uint32_t none_stat_compr_blocks=0,none_stat_decompr_blocks=0,none_stat_compr_size=0;
Index: compr.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- compr.h 16 Jul 2004 15:17:57 -0000 1.6
+++ compr.h 17 Mar 2005 20:23:06 -0000 1.7
@@ -41,9 +41,6 @@
#define JFFS2_COMPR_MODE_PRIORITY 1
#define JFFS2_COMPR_MODE_SIZE 2
-void jffs2_set_compression_mode(int mode);
-int jffs2_get_compression_mode(void);
-
struct jffs2_compressor {
struct list_head list;
int priority; /* used by prirority comr. mode */
Index: compr_rtime.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr_rtime.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- compr_rtime.c 23 Jun 2004 16:34:40 -0000 1.14
+++ compr_rtime.c 17 Mar 2005 20:23:06 -0000 1.15
@@ -29,8 +29,10 @@
#include "compr.h"
/* _compress returns the compressed size, -1 if bigger */
-int jffs2_rtime_compress(unsigned char *data_in, unsigned char *cpage_out,
- uint32_t *sourcelen, uint32_t *dstlen, void *model)
+static int jffs2_rtime_compress(unsigned char *data_in,
+ unsigned char *cpage_out,
+ uint32_t *sourcelen, uint32_t *dstlen,
+ void *model)
{
short positions[256];
int outpos = 0;
@@ -69,8 +71,10 @@
}
-int jffs2_rtime_decompress(unsigned char *data_in, unsigned char *cpage_out,
- uint32_t srclen, uint32_t destlen, void *model)
+static int jffs2_rtime_decompress(unsigned char *data_in,
+ unsigned char *cpage_out,
+ uint32_t srclen, uint32_t destlen,
+ void *model)
{
short positions[256];
int outpos = 0;
Index: erase.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/erase.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- erase.c 27 Feb 2005 23:01:32 -0000 1.72
+++ erase.c 17 Mar 2005 20:23:06 -0000 1.73
@@ -33,7 +33,8 @@
static void jffs2_free_all_node_refs(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
-void jffs2_erase_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
+static void jffs2_erase_block(struct jffs2_sb_info *c,
+ struct jffs2_eraseblock *jeb)
{
int ret;
uint32_t bad_offset;
Index: file.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/file.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- file.c 16 Nov 2004 20:36:11 -0000 1.99
+++ file.c 17 Mar 2005 20:23:06 -0000 1.100
@@ -25,6 +25,11 @@
extern int generic_file_open(struct inode *, struct file *) __attribute__((weak));
extern loff_t generic_file_llseek(struct file *file, loff_t offset, int origin) __attribute__((weak));
+static int jffs2_commit_write (struct file *filp, struct page *pg,
+ unsigned start, unsigned end);
+static int jffs2_prepare_write (struct file *filp, struct page *pg,
+ unsigned start, unsigned end);
+static int jffs2_readpage (struct file *filp, struct page *pg);
int jffs2_fsync(struct file *filp, struct dentry *dentry, int datasync)
{
@@ -65,7 +70,7 @@
.commit_write = jffs2_commit_write
};
-int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
+static int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg)
{
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
@@ -105,7 +110,7 @@
}
-int jffs2_readpage (struct file *filp, struct page *pg)
+static int jffs2_readpage (struct file *filp, struct page *pg)
{
struct jffs2_inode_info *f = JFFS2_INODE_INFO(pg->mapping->host);
int ret;
@@ -116,7 +121,8 @@
return ret;
}
-int jffs2_prepare_write (struct file *filp, struct page *pg, unsigned start, unsigned end)
+static int jffs2_prepare_write (struct file *filp, struct page *pg,
+ unsigned start, unsigned end)
{
struct inode *inode = pg->mapping->host;
struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
@@ -198,7 +204,8 @@
return ret;
}
-int jffs2_commit_write (struct file *filp, struct page *pg, unsigned start, unsigned end)
+static int jffs2_commit_write (struct file *filp, struct page *pg,
+ unsigned start, unsigned end)
{
/* Actually commit the write from the page cache page we're looking at.
* For now, we write the full page out each time. It sucks, but it's simple
Index: fs.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/fs.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- fs.c 9 Feb 2005 09:23:53 -0000 1.53
+++ fs.c 17 Mar 2005 20:23:06 -0000 1.54
@@ -25,6 +25,7 @@
#include <linux/crc32.h>
#include "nodelist.h"
+static int jffs2_flash_setup(struct jffs2_sb_info *c);
static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
{
@@ -648,7 +649,7 @@
page_cache_release(pg);
}
-int jffs2_flash_setup(struct jffs2_sb_info *c) {
+static int jffs2_flash_setup(struct jffs2_sb_info *c) {
int ret = 0;
if (jffs2_cleanmarker_oob(c)) {
Index: nodelist.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.h,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- nodelist.h 27 Feb 2005 23:01:32 -0000 1.128
+++ nodelist.h 17 Mar 2005 20:23:06 -0000 1.129
@@ -461,7 +461,6 @@
int jffs2_do_mount_fs(struct jffs2_sb_info *c);
/* erase.c */
-void jffs2_erase_block(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb);
void jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count);
#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
Index: os-linux.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/os-linux.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- os-linux.h 9 Feb 2005 09:23:53 -0000 1.54
+++ os-linux.h 17 Mar 2005 20:23:06 -0000 1.55
@@ -178,11 +178,7 @@
extern struct inode_operations jffs2_file_inode_operations;
extern struct address_space_operations jffs2_file_address_operations;
int jffs2_fsync(struct file *, struct dentry *, int);
-int jffs2_do_readpage_nolock (struct inode *inode, struct page *pg);
int jffs2_do_readpage_unlock (struct inode *inode, struct page *pg);
-int jffs2_readpage (struct file *, struct page *);
-int jffs2_prepare_write (struct file *, struct page *, unsigned, unsigned);
-int jffs2_commit_write (struct file *, struct page *, unsigned, unsigned);
/* ioctl.c */
int jffs2_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
@@ -213,7 +209,6 @@
void jffs2_gc_release_page(struct jffs2_sb_info *c,
unsigned char *pg,
unsigned long *priv);
-int jffs2_flash_setup(struct jffs2_sb_info *c);
void jffs2_flash_cleanup(struct jffs2_sb_info *c);
Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/wbuf.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- wbuf.c 9 Feb 2005 09:23:54 -0000 1.89
+++ wbuf.c 17 Mar 2005 20:23:06 -0000 1.90
@@ -1124,7 +1124,7 @@
};
-int jffs2_nand_set_oobinfo(struct jffs2_sb_info *c)
+static int jffs2_nand_set_oobinfo(struct jffs2_sb_info *c)
{
struct nand_oobinfo *oinfo = &c->mtd->oobinfo;
More information about the linux-mtd-cvs
mailing list