git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git]
/
fs
/
jffs2
/
debug.h
diff --git
a/fs/jffs2/debug.h
b/fs/jffs2/debug.h
index
f193d43
..
f89c85d
100644
(file)
--- a/
fs/jffs2/debug.h
+++ b/
fs/jffs2/debug.h
@@
-13,7
+13,7
@@
#ifndef _JFFS2_DEBUG_H_
#define _JFFS2_DEBUG_H_
#ifndef _JFFS2_DEBUG_H_
#define _JFFS2_DEBUG_H_
-#include <linux/
config
.h>
+#include <linux/
sched
.h>
#ifndef CONFIG_JFFS2_FS_DEBUG
#define CONFIG_JFFS2_FS_DEBUG 0
#ifndef CONFIG_JFFS2_FS_DEBUG
#define CONFIG_JFFS2_FS_DEBUG 0
@@
-82,28
+82,28
@@
do { \
printk(JFFS2_ERR_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
do { \
printk(JFFS2_ERR_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
- __FUNCTION__
, ##__VA_ARGS__);
\
+ __FUNCTION__
, ##__VA_ARGS__);
\
} while(0)
#define JFFS2_WARNING(fmt, ...) \
do { \
printk(JFFS2_WARN_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
} while(0)
#define JFFS2_WARNING(fmt, ...) \
do { \
printk(JFFS2_WARN_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
- __FUNCTION__
, ##__VA_ARGS__);
\
+ __FUNCTION__
, ##__VA_ARGS__);
\
} while(0)
#define JFFS2_NOTICE(fmt, ...) \
do { \
printk(JFFS2_NOTICE_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
} while(0)
#define JFFS2_NOTICE(fmt, ...) \
do { \
printk(JFFS2_NOTICE_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
- __FUNCTION__
, ##__VA_ARGS__);
\
+ __FUNCTION__
, ##__VA_ARGS__);
\
} while(0)
#define JFFS2_DEBUG(fmt, ...) \
do { \
printk(JFFS2_DBG_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
} while(0)
#define JFFS2_DEBUG(fmt, ...) \
do { \
printk(JFFS2_DBG_MSG_PREFIX \
" (%d) %s: " fmt, current->pid, \
- __FUNCTION__
, ##__VA_ARGS__);
\
+ __FUNCTION__
, ##__VA_ARGS__);
\
} while(0)
/*
} while(0)
/*
@@
-171,6
+171,12
@@
#define dbg_memalloc(fmt, ...)
#endif
#define dbg_memalloc(fmt, ...)
#endif
+/* Watch the XATTR subsystem */
+#ifdef JFFS2_DBG_XATTR_MESSAGES
+#define dbg_xattr(fmt, ...) JFFS2_DEBUG(fmt, ##__VA_ARGS__)
+#else
+#define dbg_xattr(fmt, ...)
+#endif
/* "Sanity" checks */
void
/* "Sanity" checks */
void