@@ -101,18 +101,19 @@ EXPORT_SYMBOL(jbd2_inode_cache);
static int jbd2_journal_create_slab(size_t slab_size);
#ifdef CONFIG_JBD2_DEBUG
-void __jbd2_debug(int level, const char *file, const char *func,
+void __jbd2_debug(journal_t *j, int level, const char *file, const char *func,
unsigned int line, const char *fmt, ...)
{
struct va_format vaf;
va_list args;
- if (level > jbd2_journal_enable_debug)
+ if (!j || (level > jbd2_journal_enable_debug && level > j->j_debug_level))
return;
va_start(args, fmt);
vaf.fmt = fmt;
vaf.va = &args;
- printk(KERN_DEBUG "%s: (%s, %u): %pV", file, func, line, &vaf);
+ printk(KERN_DEBUG "%s: (%s, %u): (%s): %pV", file, func, line,
+ j->j_devname, &vaf);
va_end(args);
}
EXPORT_SYMBOL(__jbd2_debug);
@@ -1257,6 +1258,56 @@ static int jbd2_seq_info_release(struct inode *inode, struct file *file)
return seq_release(inode, file);
}
+#ifdef CONFIG_JBD2_DEBUG
+static int jbd2_proc_debug_show(struct seq_file *m, void *v)
+{
+ journal_t *j = m->private;
+
+ seq_printf(m, "%d\n", j->j_debug_level);
+ return 0;
+}
+
+static int jbd2_proc_debug_open(struct inode *inode, struct file *file)
+{
+ journal_t *journal = PDE_DATA(inode);
+
+ return single_open(file, jbd2_proc_debug_show, journal);
+}
+
+static ssize_t jbd2_proc_debug_write(struct file *file,
+ const char __user *buffer, size_t count, loff_t *ppos)
+{
+ struct seq_file *seq = file->private_data;
+ journal_t *j = seq->private;
+ char value[6];
+ long level;
+
+ if (count > sizeof(value))
+ return -EINVAL;
+
+ if (copy_from_user(value, buffer, count))
+ return -EFAULT;
+
+ value[count] = 0;
+ if (kstrtol(value, 10, &level) < 0)
+ return -EINVAL;
+
+ if (level < 0 || level > USHRT_MAX)
+ return -EINVAL;
+
+ j->j_debug_level = level;
+ return count;
+}
+
+static const struct proc_ops jbd2_debug_proc_ops = {
+ .proc_open = jbd2_proc_debug_open,
+ .proc_read = seq_read,
+ .proc_write = jbd2_proc_debug_write,
+ .proc_release = single_release,
+ .proc_lseek = seq_lseek,
+};
+#endif
+
static const struct proc_ops jbd2_info_proc_ops = {
.proc_open = jbd2_seq_info_open,
.proc_read = seq_read,
@@ -1272,12 +1323,19 @@ static void jbd2_stats_proc_init(journal_t *journal)
if (journal->j_proc_entry) {
proc_create_data("info", S_IRUGO, journal->j_proc_entry,
&jbd2_info_proc_ops, journal);
+#ifdef CONFIG_JBD2_DEBUG
+ proc_create_data("jbd2_debug", S_IRUGO, journal->j_proc_entry,
+ &jbd2_debug_proc_ops, journal);
+#endif
}
}
static void jbd2_stats_proc_exit(journal_t *journal)
{
remove_proc_entry("info", journal->j_proc_entry);
+#ifdef CONFIG_JBD2_DEBUG
+ remove_proc_entry("jbd2_debug", journal->j_proc_entry);
+#endif
remove_proc_entry(journal->j_devname, proc_jbd2_stats);
}
@@ -150,7 +150,7 @@ static inline void update_t_max_wait(transaction_t *transaction,
unsigned long ts)
{
#ifdef CONFIG_JBD2_DEBUG
- if (jbd2_journal_enable_debug &&
+ if ((jbd2_journal_enable_debug || transaction->t_journal->j_debug_level) &&
time_after(transaction->t_start, ts)) {
ts = jbd2_time_diff(ts, transaction->t_start);
spin_lock(&transaction->t_handle_lock);
@@ -47,23 +47,6 @@
*/
#define JBD2_DEFAULT_MAX_COMMIT_AGE 5
-#ifdef CONFIG_JBD2_DEBUG
-/*
- * Define JBD2_EXPENSIVE_CHECKING to enable more expensive internal
- * consistency checks. By default we don't do this unless
- * CONFIG_JBD2_DEBUG is on.
- */
-#define JBD2_EXPENSIVE_CHECKING
-extern ushort jbd2_journal_enable_debug;
-void __jbd2_debug(int level, const char *file, const char *func,
- unsigned int line, const char *fmt, ...);
-
-#define jbd_debug(n, fmt, a...) \
- __jbd2_debug((n), __FILE__, __func__, __LINE__, (fmt), ##a)
-#else
-#define jbd_debug(n, fmt, a...) /**/
-#endif
-
extern void *jbd2_alloc(size_t size, gfp_t flags);
extern void jbd2_free(void *ptr, size_t size);
@@ -106,6 +89,23 @@ typedef struct jbd2_journal_handle handle_t; /* Atomic operation type */
typedef struct journal_s journal_t; /* Journal control structure */
#endif
+#ifdef CONFIG_JBD2_DEBUG
+/*
+ * Define JBD2_EXPENSIVE_CHECKING to enable more expensive internal
+ * consistency checks. By default we don't do this unless
+ * CONFIG_JBD2_DEBUG is on.
+ */
+#define JBD2_EXPENSIVE_CHECKING
+extern ushort jbd2_journal_enable_debug;
+void __jbd2_debug(journal_t *j, int level, const char *file, const char *func,
+ unsigned int line, const char *fmt, ...);
+
+#define jbd_debug(j, n, fmt, a...) \
+ __jbd2_debug((j), (n), __FILE__, __func__, __LINE__, (fmt), ##a)
+#else
+#define jbd_debug(j, n, fmt, a...) /**/
+#endif
+
/*
* Internal structures used by the logging mechanism:
*/
@@ -1211,6 +1211,13 @@ struct journal_s
*/
struct transaction_stats_s j_stats;
+#ifdef CONFIG_JBD2_DEBUG
+ /**
+ * @j_debug_level: debugging level for jbd2.
+ */
+ unsigned short j_debug_level;
+#endif
+
/**
* @j_failed_commit: Failed journal commit ID.
*/