diff --git a/fs/jfs/jfs_debug.h b/fs/jfs/jfs_debug.h index 48e2150c092e..15f3ea8cfe18 100644 --- a/fs/jfs/jfs_debug.h +++ b/fs/jfs/jfs_debug.h @@ -38,7 +38,7 @@ extern void jfs_proc_clean(void); * debug ON * -------- */ -#ifdef CONFIG_JFS_DEBUG +// #ifdef CONFIG_JFS_DEBUG #define ASSERT(p) assert(p) /* printk verbosity */ @@ -79,13 +79,13 @@ int jfs_txanchor_proc_show(struct seq_file *m, void *v); * debug OFF * --------- */ -#else /* CONFIG_JFS_DEBUG */ -#define ASSERT(p) do {} while (0) -#define jfs_info(fmt, arg...) do {} while (0) -#define jfs_debug(fmt, arg...) do {} while (0) -#define jfs_warn(fmt, arg...) do {} while (0) -#define jfs_err(fmt, arg...) do {} while (0) -#endif /* CONFIG_JFS_DEBUG */ +// #else /* CONFIG_JFS_DEBUG */ +// #define ASSERT(p) do {} while (0) +// #define jfs_info(fmt, arg...) do {} while (0) +// #define jfs_debug(fmt, arg...) do {} while (0) +// #define jfs_warn(fmt, arg...) do {} while (0) +// #define jfs_err(fmt, arg...) do {} while (0) +// #endif /* CONFIG_JFS_DEBUG */ /* * statistics diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c index 9330eff210e0..087fb185791d 100644 --- a/fs/jfs/jfs_logmgr.c +++ b/fs/jfs/jfs_logmgr.c @@ -1995,6 +1995,7 @@ static int lbmRead(struct jfs_log * log, int pn, struct lbuf ** bpp) bio->bi_iter.bi_size = 0; lbmIODone(bio); } else { + pr_info("submitting bio 1: 0x%p\n", bio); submit_bio(bio); } @@ -2140,6 +2141,7 @@ static void lbmStartIO(struct lbuf * bp) bio->bi_iter.bi_size = 0; lbmIODone(bio); } else { + pr_info("submitting bio: 0x%p\n", bio); submit_bio(bio); INCREMENT(lmStat.submitted); } @@ -2183,6 +2185,7 @@ static void lbmIODone(struct bio *bio) struct jfs_log *log; unsigned long flags; + pr_info("bio done: 0x%p\n", bio); /* * get back jfs buffer bound to the i/o buffer */ diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 176580f54af9..ab36475c9d4d 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c @@ -398,6 +398,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc) inc_io(page); if (!bio->bi_iter.bi_size) goto dump_bio; + pr_info("submitting bio 5: 0x%p\n", bio); submit_bio(bio); nr_underway++; bio = NULL; @@ -436,6 +437,7 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc) if (!bio->bi_iter.bi_size) goto dump_bio; + pr_info("submitting bio 6: 0x%p\n", bio); submit_bio(bio); nr_underway++; } @@ -493,8 +495,10 @@ static int metapage_readpage(struct file *fp, struct page *page) if (!PagePrivate(page)) insert_metapage(page, NULL); inc_io(page); - if (bio) + if (bio) { + pr_info("submitting bio 4: 0x%p\n", bio); submit_bio(bio); + } bio = bio_alloc(GFP_NOFS, 1); bio_set_dev(bio, inode->i_sb->s_bdev); @@ -511,8 +515,10 @@ static int metapage_readpage(struct file *fp, struct page *page) } else block_offset++; } - if (bio) + if (bio) { + pr_info("submitting bio 3: 0x%p\n", bio); submit_bio(bio); + } else unlock_page(page); diff --git a/fs/jfs/super.c b/fs/jfs/super.c index 1f0ffabbde56..79c89a81d833 100644 --- a/fs/jfs/super.c +++ b/fs/jfs/super.c @@ -53,11 +53,11 @@ static struct task_struct *jfsCommitThread[MAX_COMMIT_THREADS]; struct task_struct *jfsIOthread; struct task_struct *jfsSyncThread; -#ifdef CONFIG_JFS_DEBUG -int jfsloglevel = JFS_LOGLEVEL_WARN; +// #ifdef CONFIG_JFS_DEBUG +int jfsloglevel = JFS_LOGLEVEL_INFO; module_param(jfsloglevel, int, 0644); MODULE_PARM_DESC(jfsloglevel, "Specify JFS loglevel (0, 1 or 2)"); -#endif +// #endif static void jfs_handle_error(struct super_block *sb) {