diff options
author | Joe Perches <joe@perches.com> | 2010-11-09 19:35:21 -0500 |
---|---|---|
committer | Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> | 2011-01-10 00:05:45 -0500 |
commit | b004a5eb0babec7ef91558f73315ef49e5a1f285 (patch) | |
tree | 93683947103b7305889dd3d3bb3cb951a2c0409b /fs/nilfs2 | |
parent | af1761f268ff2a58f2ea22e9b9de6359f7b2048e (diff) |
fs/nilfs2/super.c: Use printf extension %pV
Using %pV reduces the number of printk calls and
eliminates any possible message interleaving from
other printk calls.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
Diffstat (limited to 'fs/nilfs2')
-rw-r--r-- | fs/nilfs2/super.c | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index e2dcc9c733f7..f0ab826251c0 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c | |||
@@ -111,12 +111,17 @@ void nilfs_error(struct super_block *sb, const char *function, | |||
111 | const char *fmt, ...) | 111 | const char *fmt, ...) |
112 | { | 112 | { |
113 | struct nilfs_sb_info *sbi = NILFS_SB(sb); | 113 | struct nilfs_sb_info *sbi = NILFS_SB(sb); |
114 | struct va_format vaf; | ||
114 | va_list args; | 115 | va_list args; |
115 | 116 | ||
116 | va_start(args, fmt); | 117 | va_start(args, fmt); |
117 | printk(KERN_CRIT "NILFS error (device %s): %s: ", sb->s_id, function); | 118 | |
118 | vprintk(fmt, args); | 119 | vaf.fmt = fmt; |
119 | printk("\n"); | 120 | vaf.va = &args; |
121 | |||
122 | printk(KERN_CRIT "NILFS error (device %s): %s: %pV\n", | ||
123 | sb->s_id, function, &vaf); | ||
124 | |||
120 | va_end(args); | 125 | va_end(args); |
121 | 126 | ||
122 | if (!(sb->s_flags & MS_RDONLY)) { | 127 | if (!(sb->s_flags & MS_RDONLY)) { |
@@ -136,13 +141,17 @@ void nilfs_error(struct super_block *sb, const char *function, | |||
136 | void nilfs_warning(struct super_block *sb, const char *function, | 141 | void nilfs_warning(struct super_block *sb, const char *function, |
137 | const char *fmt, ...) | 142 | const char *fmt, ...) |
138 | { | 143 | { |
144 | struct va_format vaf; | ||
139 | va_list args; | 145 | va_list args; |
140 | 146 | ||
141 | va_start(args, fmt); | 147 | va_start(args, fmt); |
142 | printk(KERN_WARNING "NILFS warning (device %s): %s: ", | 148 | |
143 | sb->s_id, function); | 149 | vaf.fmt = fmt; |
144 | vprintk(fmt, args); | 150 | vaf.va = &args; |
145 | printk("\n"); | 151 | |
152 | printk(KERN_WARNING "NILFS warning (device %s): %s: %pV\n", | ||
153 | sb->s_id, function, &vaf); | ||
154 | |||
146 | va_end(args); | 155 | va_end(args); |
147 | } | 156 | } |
148 | 157 | ||