aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem B. Bityutskiy <dedekind@infradead.org>2005-07-24 11:29:59 -0400
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-06 11:17:32 -0500
commitf302cd028c90ddbca20cb5388458ae0f0dd03d9b (patch)
tree9f78e99aba22b3b24047d48c6e6964889df83b11
parente0c8e42f8f218063ff6838b25038ccef7ddf257e (diff)
[JFFS2] Namespace clean up
Rename functions to a name matching the functionality. Remove stall debug code Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--fs/jffs2/debug.h21
-rw-r--r--fs/jffs2/fs.c4
-rw-r--r--fs/jffs2/nodelist.h4
-rw-r--r--fs/jffs2/readinode.c6
-rw-r--r--include/linux/jffs2.h6
5 files changed, 11 insertions, 30 deletions
diff --git a/fs/jffs2/debug.h b/fs/jffs2/debug.h
index 51ff099a6502..3c3c2940f272 100644
--- a/fs/jffs2/debug.h
+++ b/fs/jffs2/debug.h
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: debug.h,v 1.5 2005/07/24 15:14:14 dedekind Exp $ 10 * $Id: debug.h,v 1.6 2005/07/24 15:18:26 dedekind Exp $
11 * 11 *
12 */ 12 */
13#ifndef _JFFS2_DEBUG_H_ 13#ifndef _JFFS2_DEBUG_H_
@@ -15,25 +15,6 @@
15 15
16#include <linux/config.h> 16#include <linux/config.h>
17 17
18/* ------------------------------------------------ */
19/* TODO: remove */
20#undef CONFIG_JFFS2_FS_DEBUG
21#define CONFIG_JFFS2_FS_DEBUG 0
22//#define JFFS2_DBG_PARANOIA_CHECKS
23//#define JFFS2_DBG_DUMPS
24#define JFFS2_DBG_READINODE_MESSAGES
25//#define JFFS2_DBG_FRAGTREE_MESSAGES
26//#define JFFS2_DBG_FRAGTREE2_MESSAGES
27#undef KERN_DEBUG
28#undef KERN_WARNING
29#undef KERN_NOTICE
30#undef KERN_ERR
31#define KERN_DEBUG KERN_CRIT
32#define KERN_WARNING KERN_CRIT
33#define KERN_NOTICE KERN_CRIT
34#define KERN_ERR KERN_CRIT
35/* ------------------------------------------------ */
36
37#ifndef CONFIG_JFFS2_FS_DEBUG 18#ifndef CONFIG_JFFS2_FS_DEBUG
38#define CONFIG_JFFS2_FS_DEBUG 1 19#define CONFIG_JFFS2_FS_DEBUG 1
39#endif 20#endif
diff --git a/fs/jffs2/fs.c b/fs/jffs2/fs.c
index 34731614b57a..cc18b92234c4 100644
--- a/fs/jffs2/fs.c
+++ b/fs/jffs2/fs.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: fs.c,v 1.60 2005/07/22 10:32:08 dedekind Exp $ 10 * $Id: fs.c,v 1.61 2005/07/24 15:29:56 dedekind Exp $
11 * 11 *
12 */ 12 */
13 13
@@ -147,7 +147,7 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
147 old_metadata = f->metadata; 147 old_metadata = f->metadata;
148 148
149 if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size) 149 if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size)
150 jffs2_truncate_fraglist (c, &f->fragtree, iattr->ia_size); 150 jffs2_truncate_fragtree (c, &f->fragtree, iattr->ia_size);
151 151
152 if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) { 152 if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) {
153 jffs2_add_full_dnode_to_inode(c, f, new_metadata); 153 jffs2_add_full_dnode_to_inode(c, f, new_metadata);
diff --git a/fs/jffs2/nodelist.h b/fs/jffs2/nodelist.h
index dde9b86e43b5..0058e395641b 100644
--- a/fs/jffs2/nodelist.h
+++ b/fs/jffs2/nodelist.h
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: nodelist.h,v 1.133 2005/07/22 10:32:08 dedekind Exp $ 10 * $Id: nodelist.h,v 1.134 2005/07/24 15:29:56 dedekind Exp $
11 * 11 *
12 */ 12 */
13 13
@@ -336,7 +336,7 @@ int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint
336 336
337 337
338/* readinode.c */ 338/* readinode.c */
339void jffs2_truncate_fraglist (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size); 339void jffs2_truncate_fragtree (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size);
340int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_full_dnode *fn); 340int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_full_dnode *fn);
341int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, 341int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f,
342 uint32_t ino, struct jffs2_raw_inode *latest_node); 342 uint32_t ino, struct jffs2_raw_inode *latest_node);
diff --git a/fs/jffs2/readinode.c b/fs/jffs2/readinode.c
index 02b02c1146bf..339ba46320fa 100644
--- a/fs/jffs2/readinode.c
+++ b/fs/jffs2/readinode.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * For licensing information, see the file 'LICENCE' in this directory. 8 * For licensing information, see the file 'LICENCE' in this directory.
9 * 9 *
10 * $Id: readinode.c,v 1.129 2005/07/22 10:32:08 dedekind Exp $ 10 * $Id: readinode.c,v 1.130 2005/07/24 15:29:56 dedekind Exp $
11 * 11 *
12 */ 12 */
13 13
@@ -273,7 +273,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *l
273 return 0; 273 return 0;
274} 274}
275 275
276void jffs2_truncate_fraglist (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size) 276void jffs2_truncate_fragtree (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size)
277{ 277{
278 struct jffs2_node_frag *frag = jffs2_lookup_node_frag(list, size); 278 struct jffs2_node_frag *frag = jffs2_lookup_node_frag(list, size);
279 279
@@ -534,7 +534,7 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c,
534 534
535 case S_IFREG: 535 case S_IFREG:
536 /* If it was a regular file, truncate it to the latest node's isize */ 536 /* If it was a regular file, truncate it to the latest node's isize */
537 jffs2_truncate_fraglist(c, &f->fragtree, je32_to_cpu(latest_node->isize)); 537 jffs2_truncate_fragtree(c, &f->fragtree, je32_to_cpu(latest_node->isize));
538 break; 538 break;
539 539
540 case S_IFLNK: 540 case S_IFLNK:
diff --git a/include/linux/jffs2.h b/include/linux/jffs2.h
index 419fc953ac16..7bc51add62fa 100644
--- a/include/linux/jffs2.h
+++ b/include/linux/jffs2.h
@@ -8,7 +8,7 @@
8 * For licensing information, see the file 'LICENCE' in the 8 * For licensing information, see the file 'LICENCE' in the
9 * jffs2 directory. 9 * jffs2 directory.
10 * 10 *
11 * $Id: jffs2.h,v 1.34 2004/11/16 20:36:14 dwmw2 Exp $ 11 * $Id: jffs2.h,v 1.35 2005/07/24 15:15:51 dedekind Exp $
12 * 12 *
13 */ 13 */
14 14
@@ -101,7 +101,7 @@ struct jffs2_unknown_node
101struct jffs2_raw_dirent 101struct jffs2_raw_dirent
102{ 102{
103 jint16_t magic; 103 jint16_t magic;
104 jint16_t nodetype; /* == JFFS_NODETYPE_DIRENT */ 104 jint16_t nodetype; /* == JFFS2_NODETYPE_DIRENT */
105 jint32_t totlen; 105 jint32_t totlen;
106 jint32_t hdr_crc; 106 jint32_t hdr_crc;
107 jint32_t pino; 107 jint32_t pino;
@@ -125,7 +125,7 @@ struct jffs2_raw_dirent
125struct jffs2_raw_inode 125struct jffs2_raw_inode
126{ 126{
127 jint16_t magic; /* A constant magic number. */ 127 jint16_t magic; /* A constant magic number. */
128 jint16_t nodetype; /* == JFFS_NODETYPE_INODE */ 128 jint16_t nodetype; /* == JFFS2_NODETYPE_INODE */
129 jint32_t totlen; /* Total length of this node (inc data, etc.) */ 129 jint32_t totlen; /* Total length of this node (inc data, etc.) */
130 jint32_t hdr_crc; 130 jint32_t hdr_crc;
131 jint32_t ino; /* Inode number. */ 131 jint32_t ino; /* Inode number. */