← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to fs/jffs2/debug.h

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/jffs2/debug.h
51
51
 * superseded by nicer dbg_xxx() macros...
52
52
 */
53
53
#if CONFIG_JFFS2_FS_DEBUG > 0
 
54
#define DEBUG
54
55
#define D1(x) x
55
56
#else
56
57
#define D1(x)
62
63
#define D2(x)
63
64
#endif
64
65
 
 
66
#define jffs2_dbg(level, fmt, ...)              \
 
67
do {                                            \
 
68
        if (CONFIG_JFFS2_FS_DEBUG >= level)     \
 
69
                pr_debug(fmt, ##__VA_ARGS__);   \
 
70
} while (0)
 
71
 
65
72
/* The prefixes of JFFS2 messages */
 
73
#define JFFS2_DBG               KERN_DEBUG
66
74
#define JFFS2_DBG_PREFIX        "[JFFS2 DBG]"
67
 
#define JFFS2_ERR_PREFIX        "JFFS2 error:"
68
 
#define JFFS2_WARN_PREFIX       "JFFS2 warning:"
69
 
#define JFFS2_NOTICE_PREFIX     "JFFS2 notice:"
70
 
 
71
 
#define JFFS2_ERR       KERN_ERR
72
 
#define JFFS2_WARN      KERN_WARNING
73
 
#define JFFS2_NOT       KERN_NOTICE
74
 
#define JFFS2_DBG       KERN_DEBUG
75
 
 
76
75
#define JFFS2_DBG_MSG_PREFIX    JFFS2_DBG JFFS2_DBG_PREFIX
77
 
#define JFFS2_ERR_MSG_PREFIX    JFFS2_ERR JFFS2_ERR_PREFIX
78
 
#define JFFS2_WARN_MSG_PREFIX   JFFS2_WARN JFFS2_WARN_PREFIX
79
 
#define JFFS2_NOTICE_MSG_PREFIX JFFS2_NOT JFFS2_NOTICE_PREFIX
80
76
 
81
77
/* JFFS2 message macros */
82
 
#define JFFS2_ERROR(fmt, ...)                                           \
83
 
        do {                                                            \
84
 
                printk(JFFS2_ERR_MSG_PREFIX                             \
85
 
                        " (%d) %s: " fmt, task_pid_nr(current),         \
86
 
                        __func__ , ##__VA_ARGS__);                      \
87
 
        } while(0)
 
78
#define JFFS2_ERROR(fmt, ...)                                   \
 
79
        pr_err("error: (%d) %s: " fmt,                          \
 
80
               task_pid_nr(current), __func__, ##__VA_ARGS__)
88
81
 
89
82
#define JFFS2_WARNING(fmt, ...)                                         \
90
 
        do {                                                            \
91
 
                printk(JFFS2_WARN_MSG_PREFIX                            \
92
 
                        " (%d) %s: " fmt, task_pid_nr(current),         \
93
 
                        __func__ , ##__VA_ARGS__);                      \
94
 
        } while(0)
 
83
        pr_warn("warning: (%d) %s: " fmt,                               \
 
84
                task_pid_nr(current), __func__, ##__VA_ARGS__)
95
85
 
96
86
#define JFFS2_NOTICE(fmt, ...)                                          \
97
 
        do {                                                            \
98
 
                printk(JFFS2_NOTICE_MSG_PREFIX                          \
99
 
                        " (%d) %s: " fmt, task_pid_nr(current),         \
100
 
                        __func__ , ##__VA_ARGS__);                      \
101
 
        } while(0)
 
87
        pr_notice("notice: (%d) %s: " fmt,                              \
 
88
                  task_pid_nr(current), __func__, ##__VA_ARGS__)
102
89
 
103
90
#define JFFS2_DEBUG(fmt, ...)                                           \
104
 
        do {                                                            \
105
 
                printk(JFFS2_DBG_MSG_PREFIX                             \
106
 
                        " (%d) %s: " fmt, task_pid_nr(current),         \
107
 
                        __func__ , ##__VA_ARGS__);                      \
108
 
        } while(0)
 
91
        printk(KERN_DEBUG "[JFFS2 DBG] (%d) %s: " fmt,                  \
 
92
               task_pid_nr(current), __func__, ##__VA_ARGS__)
109
93
 
110
94
/*
111
95
 * We split our debugging messages on several parts, depending on the JFFS2