Commit 1c131886 authored by Heinz Mauelshagen's avatar Heinz Mauelshagen Committed by Mike Snitzer
Browse files

dm: prefer '"%s...", __func__' 



Signed-off-by: default avatarHeinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: default avatarMike Snitzer <snitzer@kernel.org>
parent aa07f9d8

drivers/md/dm-cache-metadata.c

+6 −6
Original line number Diff line number Diff line
@@ -203,15 +203,15 @@ static int sb_check(struct dm_block_validator *v, 
	__le32 csum_le;



	if (dm_block_location(b) != le64_to_cpu(disk_super->blocknr)) {

		DMERR("sb_check failed: blocknr %llu: wanted %llu",

		      le64_to_cpu(disk_super->blocknr),

		DMERR("%s failed: blocknr %llu: wanted %llu",

		      __func__, le64_to_cpu(disk_super->blocknr),

		      (unsigned long long)dm_block_location(b));

		return -ENOTBLK;

	}



	if (le64_to_cpu(disk_super->magic) != CACHE_SUPERBLOCK_MAGIC) {

		DMERR("sb_check failed: magic %llu: wanted %llu",

		      le64_to_cpu(disk_super->magic),

		DMERR("%s failed: magic %llu: wanted %llu",

		      __func__, le64_to_cpu(disk_super->magic),

		      (unsigned long long)CACHE_SUPERBLOCK_MAGIC);

		return -EILSEQ;

	}
@@ -220,8 +220,8 @@ static int sb_check(struct dm_block_validator *v, 
					     sb_block_size - sizeof(__le32),

					     SUPERBLOCK_CSUM_XOR));

	if (csum_le != disk_super->csum) {

		DMERR("sb_check failed: csum %u: wanted %u",

		      le32_to_cpu(csum_le), le32_to_cpu(disk_super->csum));

		DMERR("%s failed: csum %u: wanted %u",

		      __func__, le32_to_cpu(csum_le), le32_to_cpu(disk_super->csum));

		return -EILSEQ;

	}

drivers/md/dm-era-target.c

+6 −6
Original line number Diff line number Diff line
@@ -229,15 +229,15 @@ static int sb_check(struct dm_block_validator *v, 
	__le32 csum_le;



	if (dm_block_location(b) != le64_to_cpu(disk->blocknr)) {

		DMERR("sb_check failed: blocknr %llu: wanted %llu",

		      le64_to_cpu(disk->blocknr),

		DMERR("%s failed: blocknr %llu: wanted %llu",

		      __func__, le64_to_cpu(disk->blocknr),

		      (unsigned long long)dm_block_location(b));

		return -ENOTBLK;

	}



	if (le64_to_cpu(disk->magic) != SUPERBLOCK_MAGIC) {

		DMERR("sb_check failed: magic %llu: wanted %llu",

		      le64_to_cpu(disk->magic),

		DMERR("%s failed: magic %llu: wanted %llu",

		      __func__, le64_to_cpu(disk->magic),

		      (unsigned long long) SUPERBLOCK_MAGIC);

		return -EILSEQ;

	}
@@ -246,8 +246,8 @@ static int sb_check(struct dm_block_validator *v, 
					     sb_block_size - sizeof(__le32),

					     SUPERBLOCK_CSUM_XOR));

	if (csum_le != disk->csum) {

		DMERR("sb_check failed: csum %u: wanted %u",

		      le32_to_cpu(csum_le), le32_to_cpu(disk->csum));

		DMERR("%s failed: csum %u: wanted %u",

		      __func__, le32_to_cpu(csum_le), le32_to_cpu(disk->csum));

		return -EILSEQ;

	}

drivers/md/dm-integrity.c

+2 −2
Original line number Diff line number Diff line
@@ -3093,7 +3093,7 @@ static void replay_journal(struct dm_integrity_c *ic) 


static void dm_integrity_enter_synchronous_mode(struct dm_integrity_c *ic)

{

	DEBUG_print("dm_integrity_enter_synchronous_mode\n");

	DEBUG_print("%s\n", __func__);



	if (ic->mode == 'B') {

		ic->bitmap_flush_interval = msecs_to_jiffies(10) + 1;
@@ -3109,7 +3109,7 @@ static int dm_integrity_reboot(struct notifier_block *n, unsigned long code, voi 
{

	struct dm_integrity_c *ic = container_of(n, struct dm_integrity_c, reboot_notifier);



	DEBUG_print("dm_integrity_reboot\n");

	DEBUG_print("%s\n", __func__);



	dm_integrity_enter_synchronous_mode(ic);

drivers/md/dm-ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -1409,7 +1409,7 @@ static int populate_table(struct dm_table *table, 
	char *target_params;



	if (!param->target_count) {

		DMERR("populate_table: no targets specified");

		DMERR("%s: no targets specified", __func__);

		return -EINVAL;

	}

drivers/md/dm-mpath.c

+7 −7
Original line number Diff line number Diff line
@@ -739,15 +739,15 @@ static void process_queued_bios(struct work_struct *work) 
/*

 * If we run out of usable paths, should we queue I/O or error it?

 */

static int queue_if_no_path(struct multipath *m, bool queue_if_no_path,

static int queue_if_no_path(struct multipath *m, bool f_queue_if_no_path,

			    bool save_old_value, const char *caller)

{

	unsigned long flags;

	bool queue_if_no_path_bit, saved_queue_if_no_path_bit;

	const char *dm_dev_name = dm_table_device_name(m->ti->table);



	DMDEBUG("%s: %s caller=%s queue_if_no_path=%d save_old_value=%d",

		dm_dev_name, __func__, caller, queue_if_no_path, save_old_value);

	DMDEBUG("%s: %s caller=%s f_queue_if_no_path=%d save_old_value=%d",

		dm_dev_name, __func__, caller, f_queue_if_no_path, save_old_value);



	spin_lock_irqsave(&m->lock, flags);
@@ -760,11 +760,11 @@ static int queue_if_no_path(struct multipath *m, bool queue_if_no_path, 
			      dm_dev_name);

		} else

			assign_bit(MPATHF_SAVED_QUEUE_IF_NO_PATH, &m->flags, queue_if_no_path_bit);

	} else if (!queue_if_no_path && saved_queue_if_no_path_bit) {

	} else if (!f_queue_if_no_path && saved_queue_if_no_path_bit) {

		/* due to "fail_if_no_path" message, need to honor it. */

		clear_bit(MPATHF_SAVED_QUEUE_IF_NO_PATH, &m->flags);

	}

	assign_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags, queue_if_no_path);

	assign_bit(MPATHF_QUEUE_IF_NO_PATH, &m->flags, f_queue_if_no_path);



	DMDEBUG("%s: after %s changes; QIFNP = %d; SQIFNP = %d; DNFS = %d",

		dm_dev_name, __func__,
@@ -774,7 +774,7 @@ static int queue_if_no_path(struct multipath *m, bool queue_if_no_path, 


	spin_unlock_irqrestore(&m->lock, flags);



	if (!queue_if_no_path) {

	if (!f_queue_if_no_path) {

		dm_table_run_md_queue_async(m->ti->table);

		process_queued_io_list(m);

	}
@@ -1468,7 +1468,7 @@ static int switch_pg_num(struct multipath *m, const char *pgstr) 


	if (!pgstr || (sscanf(pgstr, "%u%c", &pgnum, &dummy) != 1) || !pgnum ||

	    !m->nr_priority_groups || (pgnum > m->nr_priority_groups)) {

		DMWARN("invalid PG number supplied to switch_pg_num");

		DMWARN("invalid PG number supplied to %s", __func__);

		return -EINVAL;

	}