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

Commit 07bc94fd authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

fs/ufs/super.c: use __func__ in logging 



Replace approximate function name by __func__ using standard format
"function():"

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Evgeniy Dushistov <dushistov@mail.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent de771bda

fs/ufs/super.c

+18 −18
Original line number Original line Diff line number Diff line
@@ -1030,7 +1030,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) 
		goto again;

		goto again;

	}

	}

	if (!silent)

	if (!silent)

		pr_err("ufs_read_super: bad magic number\n");

		pr_err("%s(): bad magic number\n", __func__);

	goto failed;

	goto failed;





magic_found:

magic_found:
@@ -1044,33 +1044,33 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) 
	uspi->s_fshift = fs32_to_cpu(sb, usb1->fs_fshift);

	uspi->s_fshift = fs32_to_cpu(sb, usb1->fs_fshift);





	if (!is_power_of_2(uspi->s_fsize)) {

	if (!is_power_of_2(uspi->s_fsize)) {

		pr_err("ufs_read_super: fragment size %u is not a power of 2\n",

		pr_err("%s(): fragment size %u is not a power of 2\n",

		       uspi->s_fsize);

		       __func__, uspi->s_fsize);

		goto failed;

		goto failed;

	}

	}

	if (uspi->s_fsize < 512) {

	if (uspi->s_fsize < 512) {

		pr_err("ufs_read_super: fragment size %u is too small\n",

		pr_err("%s(): fragment size %u is too small\n",

		       uspi->s_fsize);

		       __func__, uspi->s_fsize);

		goto failed;

		goto failed;

	}

	}

	if (uspi->s_fsize > 4096) {

	if (uspi->s_fsize > 4096) {

		pr_err("ufs_read_super: fragment size %u is too large\n",

		pr_err("%s(): fragment size %u is too large\n",

		       uspi->s_fsize);

		       __func__, uspi->s_fsize);

		goto failed;

		goto failed;

	}

	}

	if (!is_power_of_2(uspi->s_bsize)) {

	if (!is_power_of_2(uspi->s_bsize)) {

		pr_err("ufs_read_super: block size %u is not a power of 2\n",

		pr_err("%s(): block size %u is not a power of 2\n",

		       uspi->s_bsize);

		       __func__, uspi->s_bsize);

		goto failed;

		goto failed;

	}

	}

	if (uspi->s_bsize < 4096) {

	if (uspi->s_bsize < 4096) {

		pr_err("ufs_read_super: block size %u is too small\n",

		pr_err("%s(): block size %u is too small\n",

		       uspi->s_bsize);

		       __func__, uspi->s_bsize);

		goto failed;

		goto failed;

	}

	}

	if (uspi->s_bsize / uspi->s_fsize > 8) {

	if (uspi->s_bsize / uspi->s_fsize > 8) {

		pr_err("ufs_read_super: too many fragments per block (%u)\n",

		pr_err("%s(): too many fragments per block (%u)\n",

		       uspi->s_bsize / uspi->s_fsize);

		       __func__, uspi->s_bsize / uspi->s_fsize);

		goto failed;

		goto failed;

	}

	}

	if (uspi->s_fsize != block_size || uspi->s_sbsize != super_block_size) {

	if (uspi->s_fsize != block_size || uspi->s_sbsize != super_block_size) {
@@ -1109,21 +1109,21 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent) 
			UFSD("fs is DEC OSF/1\n");

			UFSD("fs is DEC OSF/1\n");

			break;

			break;

		case UFS_FSACTIVE:

		case UFS_FSACTIVE:

			pr_err("ufs_read_super: fs is active\n");

			pr_err("%s(): fs is active\n", __func__);

			sb->s_flags |= MS_RDONLY;

			sb->s_flags |= MS_RDONLY;

			break;

			break;

		case UFS_FSBAD:

		case UFS_FSBAD:

			pr_err("ufs_read_super: fs is bad\n");

			pr_err("%s(): fs is bad\n", __func__);

			sb->s_flags |= MS_RDONLY;

			sb->s_flags |= MS_RDONLY;

			break;

			break;

		default:

		default:

			pr_err("ufs_read_super: can't grok fs_clean 0x%x\n",

			pr_err("%s(): can't grok fs_clean 0x%x\n",

			       usb1->fs_clean);

			       __func__, usb1->fs_clean);

			sb->s_flags |= MS_RDONLY;

			sb->s_flags |= MS_RDONLY;

			break;

			break;

		}

		}

	} else {

	} else {

		pr_err("ufs_read_super: fs needs fsck\n");

		pr_err("%s(): fs needs fsck\n", __func__);

		sb->s_flags |= MS_RDONLY;

		sb->s_flags |= MS_RDONLY;

	}

	}