diff options
| author | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2016-08-02 14:05:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-02 19:35:18 -0400 |
| commit | d6517deb014954d3229910e46f3b85b7ad80db3e (patch) | |
| tree | 361b5220b53f58f84bc8f853c40e105bd4b11667 /fs/nilfs2/nilfs.h | |
| parent | feee880fa58254fcc1c78bc8b6446a435cc1baf0 (diff) | |
| download | linux-d6517deb014954d3229910e46f3b85b7ad80db3e.tar.gz | |
nilfs2: replace nilfs_warning() with nilfs_msg()
Use nilfs_msg() to output warning messages and get rid of nilfs_warning() function. This also removes function names from the messages unless we embed them explicitly in format strings. Instead, some messages are revised to clarify the context. [arnd@arndb.de: avoid warning about unused variables] Link: http://lkml.kernel.org/r/20160615201945.3348205-1-arnd@arndb.de Link: http://lkml.kernel.org/r/1464875891-5443-6-git-send-email-konishi.ryusuke@lab.ntt.co.jp Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/nilfs2/nilfs.h')
| -rw-r--r-- | fs/nilfs2/nilfs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nilfs2/nilfs.h b/fs/nilfs2/nilfs.h index b57ce41e8a1a..46fbd4e00315 100644 --- a/fs/nilfs2/nilfs.h +++ b/fs/nilfs2/nilfs.h @@ -306,8 +306,6 @@ void __nilfs_msg(struct super_block *sb, const char *level, extern __printf(3, 4) void __nilfs_error(struct super_block *sb, const char *function, const char *fmt, ...); -extern __printf(3, 4) -void nilfs_warning(struct super_block *, const char *, const char *, ...); #ifdef CONFIG_PRINTK @@ -319,7 +317,10 @@ void nilfs_warning(struct super_block *, const char *, const char *, ...); #else #define nilfs_msg(sb, level, fmt, ...) \ - no_printk(fmt, ##__VA_ARGS__) + do { \ + no_printk(fmt, ##__VA_ARGS__); \ + (void)(sb); \ + } while (0) #define nilfs_error(sb, fmt, ...) \ do { \ no_printk(fmt, ##__VA_ARGS__); \ |