Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3ad9962 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

fs/autofs4/autofs_i.h

+8 −18
Original line number Diff line number Diff line
@@ -39,27 +39,17 @@ 


/* #define DEBUG */



#ifdef DEBUG

#define DPRINTK(fmt, args...)				\

do {							\

	printk(KERN_DEBUG "pid %d: %s: " fmt "\n",	\

		current->pid, __func__, ##args);	\

} while (0)

#else

#define DPRINTK(fmt, args...) do {} while (0)

#endif



#define AUTOFS_WARN(fmt, args...)			\

do {							\

#define DPRINTK(fmt, ...)				\

	pr_debug("pid %d: %s: " fmt "\n",		\

		current->pid, __func__, ##__VA_ARGS__)



#define AUTOFS_WARN(fmt, ...)				\

	printk(KERN_WARNING "pid %d: %s: " fmt "\n",	\

		current->pid, __func__, ##args);	\

} while (0)

		current->pid, __func__, ##__VA_ARGS__)



#define AUTOFS_ERROR(fmt, args...)			\

do {							\

#define AUTOFS_ERROR(fmt, ...)				\

	printk(KERN_ERR "pid %d: %s: " fmt "\n",	\

		current->pid, __func__, ##args);	\

} while (0)

		current->pid, __func__, ##__VA_ARGS__)



/* Unified info structure.  This is pointed to by both the dentry and

   inode structures.  Each file in the filesystem has an instance of this