Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c261b33 authored by Joe Perches's avatar Joe Perches Committed by David Woodhouse
Browse files

jffs2: Convert most D1/D2 macros to jffs2_dbg 



D1 and D2 macros are mostly uses to emit debugging messages.

Convert the logging uses of D1 & D2 to jffs2_dbg(level, fmt, ...)
to be a bit more consistent style with the rest of the kernel.

All jffs2_dbg output is now at KERN_DEBUG where some of
the previous uses were emitted at various KERN_<LEVEL>s.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent bf011f2e

fs/jffs2/background.c

+14 −9
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ int jffs2_start_garbage_collect_thread(struct jffs2_sb_info *c) 
		ret = PTR_ERR(tsk);

	} else {

		/* Wait for it... */

		D1(printk(KERN_DEBUG "JFFS2: Garbage collect thread is pid %d\n", tsk->pid));

		jffs2_dbg(1, "JFFS2: Garbage collect thread is pid %d\n",

			  tsk->pid);

		wait_for_completion(&c->gc_thread_start);

		ret = tsk->pid;

	}
@@ -60,7 +61,7 @@ void jffs2_stop_garbage_collect_thread(struct jffs2_sb_info *c) 
	int wait = 0;

	spin_lock(&c->erase_completion_lock);

	if (c->gc_task) {

		D1(printk(KERN_DEBUG "jffs2: Killing GC task %d\n", c->gc_task->pid));

		jffs2_dbg(1, "jffs2: Killing GC task %d\n", c->gc_task->pid);

		send_sig(SIGKILL, c->gc_task, 1);

		wait = 1;

	}
@@ -90,7 +91,7 @@ static int jffs2_garbage_collect_thread(void *_c) 
		if (!jffs2_thread_should_wake(c)) {

			set_current_state (TASK_INTERRUPTIBLE);

			spin_unlock(&c->erase_completion_lock);

			D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread sleeping...\n"));

			jffs2_dbg(1, "%s(): sleeping...\n", __func__);

			schedule();

		} else

			spin_unlock(&c->erase_completion_lock);
@@ -109,7 +110,7 @@ static int jffs2_garbage_collect_thread(void *_c) 
		schedule_timeout_interruptible(msecs_to_jiffies(50));



		if (kthread_should_stop()) {

			D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread():  kthread_stop() called.\n"));

			jffs2_dbg(1, "%s(): kthread_stop() called\n", __func__);

			goto die;

		}
@@ -126,26 +127,30 @@ static int jffs2_garbage_collect_thread(void *_c) 


			switch(signr) {

			case SIGSTOP:

				D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): SIGSTOP received.\n"));

				jffs2_dbg(1, "%s(): SIGSTOP received\n",

					  __func__);

				set_current_state(TASK_STOPPED);

				schedule();

				break;



			case SIGKILL:

				D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): SIGKILL received.\n"));

				jffs2_dbg(1, "%s(): SIGKILL received\n",

					  __func__);

				goto die;



			case SIGHUP:

				D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): SIGHUP received.\n"));

				jffs2_dbg(1, "%s(): SIGHUP received\n",

					  __func__);

				break;

			default:

				D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): signal %ld received\n", signr));

				jffs2_dbg(1, "%s(): signal %ld received\n",

					  __func__, signr);

			}

		}

		/* We don't want SIGHUP to interrupt us. STOP and KILL are OK though. */

		disallow_signal(SIGHUP);



		D1(printk(KERN_DEBUG "jffs2_garbage_collect_thread(): pass\n"));

		jffs2_dbg(1, "%s(): pass\n", __func__);

		if (jffs2_garbage_collect_pass(c) == -ENOSPC) {

			printk(KERN_NOTICE "No space for garbage collection. Aborting GC thread\n");

			goto die;

fs/jffs2/compr.c

+7 −7
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ int jffs2_register_compressor(struct jffs2_compressor *comp) 
	comp->stat_compr_new_size=0;

	comp->stat_compr_blocks=0;

	comp->stat_decompr_blocks=0;

	D1(printk(KERN_DEBUG "Registering JFFS2 compressor \"%s\"\n", comp->name));

	jffs2_dbg(1, "Registering JFFS2 compressor \"%s\"\n", comp->name);



	spin_lock(&jffs2_compressor_list_lock);
@@ -332,9 +332,9 @@ int jffs2_register_compressor(struct jffs2_compressor *comp) 


int jffs2_unregister_compressor(struct jffs2_compressor *comp)

{

	D2(struct jffs2_compressor *this;)

	D2(struct jffs2_compressor *this);



	D1(printk(KERN_DEBUG "Unregistering JFFS2 compressor \"%s\"\n", comp->name));

	jffs2_dbg(1, "Unregistering JFFS2 compressor \"%s\"\n", comp->name);



	spin_lock(&jffs2_compressor_list_lock);
@@ -377,17 +377,17 @@ int __init jffs2_compressors_init(void) 
/* Setting default compression mode */

#ifdef CONFIG_JFFS2_CMODE_NONE

	jffs2_compression_mode = JFFS2_COMPR_MODE_NONE;

	D1(printk(KERN_INFO "JFFS2: default compression mode: none\n");)

	jffs2_dbg(1, "JFFS2: default compression mode: none\n");

#else

#ifdef CONFIG_JFFS2_CMODE_SIZE

	jffs2_compression_mode = JFFS2_COMPR_MODE_SIZE;

	D1(printk(KERN_INFO "JFFS2: default compression mode: size\n");)

	jffs2_dbg(1, "JFFS2: default compression mode: size\n");

#else

#ifdef CONFIG_JFFS2_CMODE_FAVOURLZO

	jffs2_compression_mode = JFFS2_COMPR_MODE_FAVOURLZO;

	D1(printk(KERN_INFO "JFFS2: default compression mode: favourlzo\n");)

	jffs2_dbg(1, "JFFS2: default compression mode: favourlzo\n");

#else

	D1(printk(KERN_INFO "JFFS2: default compression mode: priority\n");)

	jffs2_dbg(1, "JFFS2: default compression mode: priority\n");

#endif

#endif

#endif

fs/jffs2/compr_zlib.c

+17 −14
Original line number Diff line number Diff line
@@ -45,13 +45,15 @@ static int __init alloc_workspaces(void) 
	if (!def_strm.workspace)

		return -ENOMEM;



	D1(printk(KERN_DEBUG "Allocated %d bytes for deflate workspace\n", zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL)));

	jffs2_dbg(1, "Allocated %d bytes for deflate workspace\n",

		  zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL));

	inf_strm.workspace = vmalloc(zlib_inflate_workspacesize());

	if (!inf_strm.workspace) {

		vfree(def_strm.workspace);

		return -ENOMEM;

	}

	D1(printk(KERN_DEBUG "Allocated %d bytes for inflate workspace\n", zlib_inflate_workspacesize()));

	jffs2_dbg(1, "Allocated %d bytes for inflate workspace\n",

		  zlib_inflate_workspacesize());

	return 0;

}
@@ -91,13 +93,14 @@ static int jffs2_zlib_compress(unsigned char *data_in, 
	while (def_strm.total_out < *dstlen - STREAM_END_SPACE && def_strm.total_in < *sourcelen) {

		def_strm.avail_out = *dstlen - (def_strm.total_out + STREAM_END_SPACE);

		def_strm.avail_in = min((unsigned)(*sourcelen-def_strm.total_in), def_strm.avail_out);

		D1(printk(KERN_DEBUG "calling deflate with avail_in %d, avail_out %d\n",

			  def_strm.avail_in, def_strm.avail_out));

		jffs2_dbg(1, "calling deflate with avail_in %d, avail_out %d\n",

			  def_strm.avail_in, def_strm.avail_out);

		ret = zlib_deflate(&def_strm, Z_PARTIAL_FLUSH);

		D1(printk(KERN_DEBUG "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",

			  def_strm.avail_in, def_strm.avail_out, def_strm.total_in, def_strm.total_out));

		jffs2_dbg(1, "deflate returned with avail_in %d, avail_out %d, total_in %ld, total_out %ld\n",

			  def_strm.avail_in, def_strm.avail_out,

			  def_strm.total_in, def_strm.total_out);

		if (ret != Z_OK) {

			D1(printk(KERN_DEBUG "deflate in loop returned %d\n", ret));

			jffs2_dbg(1, "deflate in loop returned %d\n", ret);

			zlib_deflateEnd(&def_strm);

			mutex_unlock(&deflate_mutex);

			return -1;
@@ -109,20 +112,20 @@ static int jffs2_zlib_compress(unsigned char *data_in, 
	zlib_deflateEnd(&def_strm);



	if (ret != Z_STREAM_END) {

		D1(printk(KERN_DEBUG "final deflate returned %d\n", ret));

		jffs2_dbg(1, "final deflate returned %d\n", ret);

		ret = -1;

		goto out;

	}



	if (def_strm.total_out >= def_strm.total_in) {

		D1(printk(KERN_DEBUG "zlib compressed %ld bytes into %ld; failing\n",

			  def_strm.total_in, def_strm.total_out));

		jffs2_dbg(1, "zlib compressed %ld bytes into %ld; failing\n",

			  def_strm.total_in, def_strm.total_out);

		ret = -1;

		goto out;

	}



	D1(printk(KERN_DEBUG "zlib compressed %ld bytes into %ld\n",

		  def_strm.total_in, def_strm.total_out));

	jffs2_dbg(1, "zlib compressed %ld bytes into %ld\n",

		  def_strm.total_in, def_strm.total_out);



	*dstlen = def_strm.total_out;

	*sourcelen = def_strm.total_in;
@@ -155,13 +158,13 @@ static int jffs2_zlib_decompress(unsigned char *data_in, 
	    ((data_in[0] & 0x0f) == Z_DEFLATED) &&

	    !(((data_in[0]<<8) + data_in[1]) % 31)) {



		D2(printk(KERN_DEBUG "inflate skipping adler32\n"));

		jffs2_dbg(2, "inflate skipping adler32\n");

		wbits = -((data_in[0] >> 4) + 8);

		inf_strm.next_in += 2;

		inf_strm.avail_in -= 2;

	} else {

		/* Let this remain D1 for now -- it should never happen */

		D1(printk(KERN_DEBUG "inflate not skipping adler32\n"));

		jffs2_dbg(1, "inflate not skipping adler32\n");

	}

fs/jffs2/debug.h

+7 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
 * superseded by nicer dbg_xxx() macros...

 */

#if CONFIG_JFFS2_FS_DEBUG > 0

#define DEBUG

#define D1(x) x

#else

#define D1(x)
@@ -62,6 +63,12 @@ 
#define D2(x)

#endif



#define jffs2_dbg(level, fmt, ...)		\

do {						\

	if (CONFIG_JFFS2_FS_DEBUG >= level)	\

		pr_debug(fmt, ##__VA_ARGS__);	\

} while (0)



/* The prefixes of JFFS2 messages */

#define JFFS2_DBG_PREFIX	"[JFFS2 DBG]"

#define JFFS2_ERR_PREFIX	"JFFS2 error:"

fs/jffs2/dir.c

+18 −14
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct dentry *jffs2_lookup(struct inode *dir_i, struct dentry *target, 
	uint32_t ino = 0;

	struct inode *inode = NULL;



	D1(printk(KERN_DEBUG "jffs2_lookup()\n"));

	jffs2_dbg(1, "jffs2_lookup()\n");



	if (target->d_name.len > JFFS2_MAX_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);
@@ -119,21 +119,22 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) 
	struct jffs2_full_dirent *fd;

	unsigned long offset, curofs;



	D1(printk(KERN_DEBUG "jffs2_readdir() for dir_i #%lu\n", filp->f_path.dentry->d_inode->i_ino));

	jffs2_dbg(1, "jffs2_readdir() for dir_i #%lu\n",

		  filp->f_path.dentry->d_inode->i_ino);



	f = JFFS2_INODE_INFO(inode);



	offset = filp->f_pos;



	if (offset == 0) {

		D1(printk(KERN_DEBUG "Dirent 0: \".\", ino #%lu\n", inode->i_ino));

		jffs2_dbg(1, "Dirent 0: \".\", ino #%lu\n", inode->i_ino);

		if (filldir(dirent, ".", 1, 0, inode->i_ino, DT_DIR) < 0)

			goto out;

		offset++;

	}

	if (offset == 1) {

		unsigned long pino = parent_ino(filp->f_path.dentry);

		D1(printk(KERN_DEBUG "Dirent 1: \"..\", ino #%lu\n", pino));

		jffs2_dbg(1, "Dirent 1: \"..\", ino #%lu\n", pino);

		if (filldir(dirent, "..", 2, 1, pino, DT_DIR) < 0)

			goto out;

		offset++;
@@ -146,16 +147,18 @@ static int jffs2_readdir(struct file *filp, void *dirent, filldir_t filldir) 
		curofs++;

		/* First loop: curofs = 2; offset = 2 */

		if (curofs < offset) {

			D2(printk(KERN_DEBUG "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",

				  fd->name, fd->ino, fd->type, curofs, offset));

			jffs2_dbg(2, "Skipping dirent: \"%s\", ino #%u, type %d, because curofs %ld < offset %ld\n",

				  fd->name, fd->ino, fd->type, curofs, offset);

			continue;

		}

		if (!fd->ino) {

			D2(printk(KERN_DEBUG "Skipping deletion dirent \"%s\"\n", fd->name));

			jffs2_dbg(2, "Skipping deletion dirent \"%s\"\n",

				  fd->name);

			offset++;

			continue;

		}

		D2(printk(KERN_DEBUG "Dirent %ld: \"%s\", ino #%u, type %d\n", offset, fd->name, fd->ino, fd->type));

		jffs2_dbg(2, "Dirent %ld: \"%s\", ino #%u, type %d\n",

			  offset, fd->name, fd->ino, fd->type);

		if (filldir(dirent, fd->name, strlen(fd->name), offset, fd->ino, fd->type) < 0)

			break;

		offset++;
@@ -184,12 +187,12 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, 


	c = JFFS2_SB_INFO(dir_i->i_sb);



	D1(printk(KERN_DEBUG "jffs2_create()\n"));

	jffs2_dbg(1, "%s()\n", __func__);



	inode = jffs2_new_inode(dir_i, mode, ri);



	if (IS_ERR(inode)) {

		D1(printk(KERN_DEBUG "jffs2_new_inode() failed\n"));

		jffs2_dbg(1, "jffs2_new_inode() failed\n");

		jffs2_free_raw_inode(ri);

		return PTR_ERR(inode);

	}
@@ -217,9 +220,9 @@ static int jffs2_create(struct inode *dir_i, struct dentry *dentry, 


	jffs2_free_raw_inode(ri);



	D1(printk(KERN_DEBUG "jffs2_create: Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",

		  inode->i_ino, inode->i_mode, inode->i_nlink,

		  f->inocache->pino_nlink, inode->i_mapping->nrpages));

	jffs2_dbg(1, "%s(): Created ino #%lu with mode %o, nlink %d(%d). nrpages %ld\n",

		  __func__, inode->i_ino, inode->i_mode, inode->i_nlink,

		  f->inocache->pino_nlink, inode->i_mapping->nrpages);



	d_instantiate(dentry, inode);

	unlock_new_inode(inode);
@@ -369,7 +372,8 @@ static int jffs2_symlink (struct inode *dir_i, struct dentry *dentry, const char 
		goto fail;

	}



	D1(printk(KERN_DEBUG "jffs2_symlink: symlink's target '%s' cached\n", (char *)f->target));

	jffs2_dbg(1, "%s(): symlink's target '%s' cached\n",

		  __func__, (char *)f->target);



	/* No data here. Only a metadata node, which will be

	   obsoleted by the first data write