quota: Use %pV and __attribute__((format (printf in __quota_error and fix fallout
Subsystems (2)
PATCH 1/1 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.
--- fs/quota/dquot.c | 18 +++++++++++------- fs/quota/quota_tree.c | 9 +++++---- include/linux/quotaops.h | 5 +++-- 3 files changed, 19 insertions(+), 13 deletions(-)
fs/quota/dquot.c +11 -7
@@ -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); } }
fs/quota/quota_tree.c +5 -4
@@ -468,8 +468,8 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,return -ENOMEM ; ret =read_blk (info, *blk, buf);if (ret <0 ) { -quota_error (dquot->dq_sb,"Can't read quota data " -"block %u" , blk); +quota_error (dquot->dq_sb,"Can't read quota data block %u" , + *blk); goto out_buf; } newblk =le32_to_cpu (ref[get_index (info, dquot->dq_id, depth)]);
@@ -493,8 +493,9 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot, }else { ret =write_blk (info, *blk, buf);if (ret <0 ) -quota_error (dquot->dq_sb,"Can't write quota " -"tree block %u" , blk); +quota_error (dquot->dq_sb, +"Can't write quota tree block %u" , + *blk); } } out_buf:
include/linux/quotaops.h +3 -2
@@ -31,8 +31,9 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia) #define quota_error(sb, fmt, args...) \ __quota_error((sb), __func__, fmt , ## args) -extern void __quota_error (struct super_block *sb,const char *func, -const char *fmt, ...); +extern __attribute__((format (printf,3 ,4 ))) +void __quota_error (struct super_block *sb,const char *func, +const char *fmt, ...);/* * declaration of quota_function calls in kernel.
Quoted 7 lines · Joe Perches
Use %pV in
__quota_errorso 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.
I already had a similar patch from you in my tree. So I've replaced it.
Honza
Quoted 85 lines
Signed-off-by Joe Perches <[email protected]>--- fs/quota/dquot.c | 18 +++++++++++------- fs/quota/quota_tree.c | 9 +++++---- include/linux/quotaops.h | 5 +++-- 3 files changed, 19 insertions(+), 13 deletions(-)fs/quota/dquot.c +11
-7@@ -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); } }fs/quota/quota_tree.c +5
-4@@ -468,8 +468,8 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot,return -ENOMEM ; ret =read_blk (info, *blk, buf);if (ret <0 ) { -quota_error (dquot->dq_sb,"Can't read quota data " -"block %u" , blk); +quota_error (dquot->dq_sb,"Can't read quota data block %u" , + *blk); goto out_buf; } newblk =le32_to_cpu (ref[get_index (info, dquot->dq_id, depth)]);@@ -493,8 +493,9 @@ static int remove_tree(struct qtree_mem_dqinfo *info, struct dquot *dquot, }else { ret =write_blk (info, *blk, buf);if (ret <0 ) -quota_error (dquot->dq_sb,"Can't write quota " -"tree block %u" , blk); +quota_error (dquot->dq_sb, +"Can't write quota tree block %u" , + *blk); } } out_buf:include/linux/quotaops.h +3
-2@@ -31,8 +31,9 @@ static inline bool is_quota_modification(struct inode *inode, struct iattr *ia) #define quota_error(sb, fmt, args...) \ __quota_error((sb), __func__, fmt , ## args) -extern void __quota_error (struct super_block *sb,const char *func, -const char *fmt, ...); +extern __attribute__((format (printf,3 ,4 ))) +void __quota_error (struct super_block *sb,const char *func, +const char *fmt, ...);/* * declaration of quota_function calls in kernel.
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Quoted 9 lines · Jan Kara
Quoted 7 lines · Joe Perches
Use %pV in
__quota_errorso 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.
I already had a similar patch from you in my tree. So I've replaced it.
Perhaps you can get your tree into linux-next.
I believe you only have to send a request to
Stephen Rothwell (cc'd).
Quoted 8 lines · Joe Perches
Quoted 7 lines · Jan Kara
Quoted 6 lines · Joe Perches
Use %pV in
__quota_errorso 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.
Quoted 7 lines
Quoted 2 lines
Quoted 1 line
Block # needed a pointer dereference.
I already had a similar patch from you in my tree. So I've replaced it.
Perhaps you can get your tree into linux-next.
I believe you only have to send a request to
Stephen Rothwell (cc'd).
It's there but I didn't push the for_next branch. I'll do that as soon
as I'm able to finish some testing on it...
Honza
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR