diff options
| author | Joe Perches <joe@perches.com> | 2010-11-23 18:49:54 -0800 | 
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2011-01-10 19:04:05 +0100 | 
| commit | 055adcbd7da75868697e767adc4f3272f6cae76c (patch) | |
| tree | 613866918d108adf8536a0d0aab0f1d3bc2c5072 /fs/quota/dquot.c | |
| parent | 9c52749232b5cef506877ac633ea14083bd17e02 (diff) | |
| download | olio-linux-3.10-055adcbd7da75868697e767adc4f3272f6cae76c.tar.xz olio-linux-3.10-055adcbd7da75868697e767adc4f3272f6cae76c.zip  | |
quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
Use %pV in __quota_error so a single printk can not be
interleaved with other logging messages.
Add __attribute__((format (printf, 3, 4))) so format
and arguments can be verified by compiler.
Make sure printk formats and arguments match.
Block # needed a pointer dereference.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/quota/dquot.c')
| -rw-r--r-- | fs/quota/dquot.c | 18 | 
1 files changed, 11 insertions, 7 deletions
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 0fed41e6efc..84becd3e477 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c @@ -133,16 +133,20 @@ __cacheline_aligned_in_smp DEFINE_SPINLOCK(dq_data_lock);  EXPORT_SYMBOL(dq_data_lock);  void __quota_error(struct super_block *sb, const char *func, -		  const char *fmt, ...) +		   const char *fmt, ...)  { -	va_list args; -  	if (printk_ratelimit()) { +		va_list args; +		struct va_format vaf; +  		va_start(args, fmt); -		printk(KERN_ERR "Quota error (device %s): %s: ", -		       sb->s_id, func); -		vprintk(fmt, args); -		printk("\n"); + +		vaf.fmt = fmt; +		vaf.va = &args; + +		printk(KERN_ERR "Quota error (device %s): %s: %pV\n", +		       sb->s_id, func, &vaf); +  		va_end(args);  	}  }  |