Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 055adcbd authored by Joe Perches's avatar Joe Perches Committed by Jan Kara
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 9c527492

fs/quota/dquot.c

+11 −7
Original line number Diff line number Diff line
@@ -135,14 +135,18 @@ EXPORT_SYMBOL(dq_data_lock); 
void __quota_error(struct super_block *sb, const char *func,

		   const char *fmt, ...)

{

	if (printk_ratelimit()) {

		va_list args;

		struct va_format vaf;



	if (printk_ratelimit()) {

		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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ 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,

extern __attribute__((format (printf, 3, 4)))

void __quota_error(struct super_block *sb, const char *func,

		   const char *fmt, ...);



/*