Commit f302cd02 authored by Artem B. Bityutskiy's avatar Artem B. Bityutskiy Committed by Thomas Gleixner
Browse files

[JFFS2] Namespace clean up 



Rename functions to a name matching the functionality.
Remove stall debug code

Signed-off-by: default avatarArtem B. Bityutskiy <dedekind@infradead.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent e0c8e42f

fs/jffs2/debug.h

+1 −20
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: debug.h,v 1.5 2005/07/24 15:14:14 dedekind Exp $

 * $Id: debug.h,v 1.6 2005/07/24 15:18:26 dedekind Exp $

 *

 */

#ifndef _JFFS2_DEBUG_H_
@@ -15,25 +15,6 @@ 


#include <linux/config.h>



/* ------------------------------------------------ */

/* TODO: remove */

#undef CONFIG_JFFS2_FS_DEBUG

#define CONFIG_JFFS2_FS_DEBUG 0

//#define JFFS2_DBG_PARANOIA_CHECKS

//#define JFFS2_DBG_DUMPS

#define JFFS2_DBG_READINODE_MESSAGES

//#define JFFS2_DBG_FRAGTREE_MESSAGES

//#define JFFS2_DBG_FRAGTREE2_MESSAGES

#undef KERN_DEBUG

#undef KERN_WARNING

#undef KERN_NOTICE

#undef KERN_ERR

#define KERN_DEBUG   KERN_CRIT

#define KERN_WARNING KERN_CRIT

#define KERN_NOTICE  KERN_CRIT

#define KERN_ERR     KERN_CRIT

/* ------------------------------------------------ */



#ifndef CONFIG_JFFS2_FS_DEBUG

#define CONFIG_JFFS2_FS_DEBUG 1

#endif

fs/jffs2/fs.c

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: fs.c,v 1.60 2005/07/22 10:32:08 dedekind Exp $

 * $Id: fs.c,v 1.61 2005/07/24 15:29:56 dedekind Exp $

 *

 */
@@ -147,7 +147,7 @@ static int jffs2_do_setattr (struct inode *inode, struct iattr *iattr) 
	old_metadata = f->metadata;



	if (ivalid & ATTR_SIZE && inode->i_size > iattr->ia_size)

		jffs2_truncate_fraglist (c, &f->fragtree, iattr->ia_size);

		jffs2_truncate_fragtree (c, &f->fragtree, iattr->ia_size);



	if (ivalid & ATTR_SIZE && inode->i_size < iattr->ia_size) {

		jffs2_add_full_dnode_to_inode(c, f, new_metadata);

fs/jffs2/nodelist.h

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: nodelist.h,v 1.133 2005/07/22 10:32:08 dedekind Exp $

 * $Id: nodelist.h,v 1.134 2005/07/24 15:29:56 dedekind Exp $

 *

 */
@@ -336,7 +336,7 @@ int jffs2_do_link (struct jffs2_sb_info *c, struct jffs2_inode_info *dir_f, uint 




/* readinode.c */

void jffs2_truncate_fraglist (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size);

void jffs2_truncate_fragtree (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size);

int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, struct jffs2_full_dnode *fn);

int jffs2_do_read_inode(struct jffs2_sb_info *c, struct jffs2_inode_info *f, 

			uint32_t ino, struct jffs2_raw_inode *latest_node);

fs/jffs2/readinode.c

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *

 * For licensing information, see the file 'LICENCE' in this directory.

 *

 * $Id: readinode.c,v 1.129 2005/07/22 10:32:08 dedekind Exp $

 * $Id: readinode.c,v 1.130 2005/07/24 15:29:56 dedekind Exp $

 *

 */
@@ -273,7 +273,7 @@ static int jffs2_add_frag_to_fragtree(struct jffs2_sb_info *c, struct rb_root *l 
	return 0;

}



void jffs2_truncate_fraglist (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size)

void jffs2_truncate_fragtree (struct jffs2_sb_info *c, struct rb_root *list, uint32_t size)

{

	struct jffs2_node_frag *frag = jffs2_lookup_node_frag(list, size);
@@ -534,7 +534,7 @@ static int jffs2_do_read_inode_internal(struct jffs2_sb_info *c, 
			

	case S_IFREG:

		/* If it was a regular file, truncate it to the latest node's isize */

		jffs2_truncate_fraglist(c, &f->fragtree, je32_to_cpu(latest_node->isize));

		jffs2_truncate_fragtree(c, &f->fragtree, je32_to_cpu(latest_node->isize));

		break;



	case S_IFLNK:

include/linux/jffs2.h

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * For licensing information, see the file 'LICENCE' in the 

 * jffs2 directory.

 *

 * $Id: jffs2.h,v 1.34 2004/11/16 20:36:14 dwmw2 Exp $

 * $Id: jffs2.h,v 1.35 2005/07/24 15:15:51 dedekind Exp $

 *

 */
@@ -101,7 +101,7 @@ struct jffs2_unknown_node 
struct jffs2_raw_dirent

{

	jint16_t magic;

	jint16_t nodetype;	/* == JFFS_NODETYPE_DIRENT */

	jint16_t nodetype;	/* == JFFS2_NODETYPE_DIRENT */

	jint32_t totlen;

	jint32_t hdr_crc;

	jint32_t pino;
@@ -125,7 +125,7 @@ struct jffs2_raw_dirent 
struct jffs2_raw_inode

{

	jint16_t magic;      /* A constant magic number.  */

	jint16_t nodetype;   /* == JFFS_NODETYPE_INODE */

	jint16_t nodetype;   /* == JFFS2_NODETYPE_INODE */

	jint32_t totlen;     /* Total length of this node (inc data, etc.) */

	jint32_t hdr_crc;

	jint32_t ino;        /* Inode number.  */