Commit 7c46d0ae authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBIFS: get rid of dbg_dump_stack 



In case of errors we almost always need the stack dump - it makes no sense
to compile it out. Remove the 'dbg_dump_stack()' function completely.

Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 1bdcc631

fs/ubifs/debug.c

+1 −1
Original line number Diff line number Diff line
@@ -1160,7 +1160,7 @@ int dbg_check_synced_i_size(const struct ubifs_info *c, struct inode *inode) 
			  "is clean", ui->ui_size, ui->synced_i_size);

		ubifs_err("i_ino %lu, i_mode %#x, i_size %lld", inode->i_ino,

			  inode->i_mode, i_size_read(inode));

		dbg_dump_stack();

		dump_stack();

		err = -EINVAL;

	}

	spin_unlock(&ui->ui_lock);

fs/ubifs/debug.h

+1 −4
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ struct ubifs_global_debug_info { 
	if (unlikely(!(expr))) {                                               \

		printk(KERN_CRIT "UBIFS assert failed in %s at %u (pid %d)\n", \

		       __func__, __LINE__, current->pid);                      \

		dbg_dump_stack();                                              \

		dump_stack();                                                  \

	}                                                                      \

} while (0)
@@ -161,8 +161,6 @@ struct ubifs_global_debug_info { 
	}                                                                      \

} while (0)



#define dbg_dump_stack() dump_stack()



#define dbg_err(fmt, ...) do {                                                 \

	ubifs_err(fmt, ##__VA_ARGS__);                                         \

} while (0)
@@ -341,7 +339,6 @@ void dbg_debugfs_exit_fs(struct ubifs_info *c); 
		printk(KERN_DEBUG fmt "\n", ##__VA_ARGS__); \

} while (0)



#define dbg_dump_stack()

#define ubifs_assert_cmt_locked(c)



#define dbg_msg(fmt, ...)       ubifs_dbg_msg(fmt, ##__VA_ARGS__)

fs/ubifs/io.c

+10 −10
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ int ubifs_leb_read(const struct ubifs_info *c, int lnum, void *buf, int offs, 
	if (err && (err != -EBADMSG || even_ebadmsg)) {

		ubifs_err("reading %d bytes from LEB %d:%d failed, error %d",

			  len, lnum, offs, err);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -130,7 +130,7 @@ int ubifs_leb_write(struct ubifs_info *c, int lnum, const void *buf, int offs, 
		ubifs_err("writing %d bytes to LEB %d:%d failed, error %d",

			  len, lnum, offs, err);

		ubifs_ro_mode(c, err);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -151,7 +151,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len, 
		ubifs_err("changing %d bytes in LEB %d failed, error %d",

			  len, lnum, err);

		ubifs_ro_mode(c, err);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -170,7 +170,7 @@ int ubifs_leb_unmap(struct ubifs_info *c, int lnum) 
	if (err) {

		ubifs_err("unmap LEB %d failed, error %d", lnum, err);

		ubifs_ro_mode(c, err);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -189,7 +189,7 @@ int ubifs_leb_map(struct ubifs_info *c, int lnum, int dtype) 
	if (err) {

		ubifs_err("mapping LEB %d failed, error %d", lnum, err);

		ubifs_ro_mode(c, err);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -202,7 +202,7 @@ int ubifs_is_mapped(const struct ubifs_info *c, int lnum) 
	if (err < 0) {

		ubifs_err("ubi_is_mapped failed for LEB %d, error %d",

			  lnum, err);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -295,7 +295,7 @@ int ubifs_check_node(const struct ubifs_info *c, const void *buf, int lnum, 
	if (!quiet) {

		ubifs_err("bad node at LEB %d:%d", lnum, offs);

		dbg_dump_node(c, buf);

		dbg_dump_stack();

		dump_stack();

	}

	return err;

}
@@ -842,7 +842,7 @@ int ubifs_wbuf_write_nolock(struct ubifs_wbuf *wbuf, void *buf, int len) 
	ubifs_err("cannot write %d bytes to LEB %d:%d, error %d",

		  len, wbuf->lnum, wbuf->offs, err);

	dbg_dump_node(c, buf);

	dbg_dump_stack();

	dump_stack();

	dbg_dump_leb(c, wbuf->lnum);

	return err;

}
@@ -961,7 +961,7 @@ int ubifs_read_node_wbuf(struct ubifs_wbuf *wbuf, void *buf, int type, int len, 
out:

	ubifs_err("bad node at LEB %d:%d", lnum, offs);

	dbg_dump_node(c, buf);

	dbg_dump_stack();

	dump_stack();

	return -EINVAL;

}
@@ -1018,7 +1018,7 @@ int ubifs_read_node(const struct ubifs_info *c, void *buf, int type, int len, 
	ubifs_err("bad node at LEB %d:%d, LEB mapping status %d", lnum, offs,

		  ubi_is_mapped(c->ubi, lnum));

	dbg_dump_node(c, buf);

	dbg_dump_stack();

	dump_stack();

	return -EINVAL;

}

fs/ubifs/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -385,7 +385,7 @@ static int make_reservation(struct ubifs_info *c, int jhead, int len) 
	if (err == -ENOSPC) {

		/* This are some budgeting problems, print useful information */

		down_write(&c->commit_sem);

		dbg_dump_stack();

		dump_stack();

		dbg_dump_budg(c, &c->bi);

		dbg_dump_lprops(c);

		cmt_retries = dbg_check_lprops(c);

fs/ubifs/lprops.c

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ void dbg_check_heap(struct ubifs_info *c, struct ubifs_lpt_heap *heap, int cat, 
out:

	if (err) {

		dbg_msg("failed cat %d hpos %d err %d", cat, i, err);

		dbg_dump_stack();

		dump_stack();

		dbg_dump_heap(c, heap, cat);

	}

}