ubifs: Add logging functions for ubifs_msg, ubifs_err and ubifs_warn
The existing logging macros are fairly large and converting the macros to functions make the object code smaller. Use %pV and __builtin_return_address(0) as appropriate. $ size fs/ubifs/built-in.o* text data bss dec hex filename 575831 309688 161312 1046831 ff92f fs/ubifs/built-in.o.allyesconfig.new 622457 312872 161120 1096449 10bb01 fs/ubifs/built-in.o.allyesconfig.old 223785 640 644 225069 36f2d fs/ubifs/built-in.o.defconfig.new 251873 640 644 253157 3dce5 fs/ubifs/built-in.o.defconfig.old Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:

committad av
Richard Weinberger

förälder
1e75a9f34a
incheckning
3e7f2c5104
@@ -42,30 +42,6 @@
|
||||
/* Version of this UBIFS implementation */
|
||||
#define UBIFS_VERSION 1
|
||||
|
||||
/* Normal UBIFS messages */
|
||||
#define ubifs_msg(c, fmt, ...) \
|
||||
pr_notice("UBIFS (ubi%d:%d): " fmt "\n", \
|
||||
(c)->vi.ubi_num, (c)->vi.vol_id, ##__VA_ARGS__)
|
||||
/* UBIFS error messages */
|
||||
#define ubifs_err(c, fmt, ...) \
|
||||
pr_err("UBIFS error (ubi%d:%d pid %d): %s: " fmt "\n", \
|
||||
(c)->vi.ubi_num, (c)->vi.vol_id, current->pid, \
|
||||
__func__, ##__VA_ARGS__)
|
||||
/* UBIFS warning messages */
|
||||
#define ubifs_warn(c, fmt, ...) \
|
||||
pr_warn("UBIFS warning (ubi%d:%d pid %d): %s: " fmt "\n", \
|
||||
(c)->vi.ubi_num, (c)->vi.vol_id, current->pid, \
|
||||
__func__, ##__VA_ARGS__)
|
||||
/*
|
||||
* A variant of 'ubifs_err()' which takes the UBIFS file-sytem description
|
||||
* object as an argument.
|
||||
*/
|
||||
#define ubifs_errc(c, fmt, ...) \
|
||||
do { \
|
||||
if (!(c)->probing) \
|
||||
ubifs_err(c, fmt, ##__VA_ARGS__); \
|
||||
} while (0)
|
||||
|
||||
/* UBIFS file system VFS magic number */
|
||||
#define UBIFS_SUPER_MAGIC 0x24051905
|
||||
|
||||
@@ -1802,4 +1778,21 @@ int ubifs_decompress(const struct ubifs_info *c, const void *buf, int len,
|
||||
#include "misc.h"
|
||||
#include "key.h"
|
||||
|
||||
/* Normal UBIFS messages */
|
||||
__printf(2, 3)
|
||||
void ubifs_msg(const struct ubifs_info *c, const char *fmt, ...);
|
||||
__printf(2, 3)
|
||||
void ubifs_err(const struct ubifs_info *c, const char *fmt, ...);
|
||||
__printf(2, 3)
|
||||
void ubifs_warn(const struct ubifs_info *c, const char *fmt, ...);
|
||||
/*
|
||||
* A variant of 'ubifs_err()' which takes the UBIFS file-sytem description
|
||||
* object as an argument.
|
||||
*/
|
||||
#define ubifs_errc(c, fmt, ...) \
|
||||
do { \
|
||||
if (!(c)->probing) \
|
||||
ubifs_err(c, fmt, ##__VA_ARGS__); \
|
||||
} while (0)
|
||||
|
||||
#endif /* !__UBIFS_H__ */
|
||||
|
Referens i nytt ärende
Block a user