Commit c3ad9962 authored by Linus Torvalds's avatar Linus Torvalds

autofs4: clean up uaotfs use of debug/info/warning printouts

Use 'pr_debug()' for DPRINTK, which will do the proper type checking on
the arguments (without generating code) even when DEBUG isn't #defined.

Also, use the standard __VA_ARGS__ for the macros, and stop the
pointless abuse of 'do { xyz } while (0)' when the macro is already a
perfectly well-formed single statement.
Reported-by: default avatarDavid Howells <dhowells@redhat.com>
Suggested-by: default avatarJoe Perches <joe@perches.com>
Cc: Ian Kent <raven@themaw.net>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 638a8439
...@@ -39,27 +39,17 @@ ...@@ -39,27 +39,17 @@
/* #define DEBUG */ /* #define DEBUG */
#ifdef DEBUG #define DPRINTK(fmt, ...) \
#define DPRINTK(fmt, args...) \ pr_debug("pid %d: %s: " fmt "\n", \
do { \ current->pid, __func__, ##__VA_ARGS__)
printk(KERN_DEBUG "pid %d: %s: " fmt "\n", \
current->pid, __func__, ##args); \ #define AUTOFS_WARN(fmt, ...) \
} while (0)
#else
#define DPRINTK(fmt, args...) do {} while (0)
#endif
#define AUTOFS_WARN(fmt, args...) \
do { \
printk(KERN_WARNING "pid %d: %s: " fmt "\n", \ printk(KERN_WARNING "pid %d: %s: " fmt "\n", \
current->pid, __func__, ##args); \ current->pid, __func__, ##__VA_ARGS__)
} while (0)
#define AUTOFS_ERROR(fmt, args...) \ #define AUTOFS_ERROR(fmt, ...) \
do { \
printk(KERN_ERR "pid %d: %s: " fmt "\n", \ printk(KERN_ERR "pid %d: %s: " fmt "\n", \
current->pid, __func__, ##args); \ current->pid, __func__, ##__VA_ARGS__)
} while (0)
/* Unified info structure. This is pointed to by both the dentry and /* Unified info structure. This is pointed to by both the dentry and
inode structures. Each file in the filesystem has an instance of this inode structures. Each file in the filesystem has an instance of this
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment