Skip to content

Commit

Permalink
fs/ufs/super.c: use __func__ in logging
Browse files Browse the repository at this point in the history
Replace approximate function name by __func__ using standard format
"function():"

Signed-off-by: Fabian Frederick <[email protected]>
Cc: Evgeniy Dushistov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Fabian Frederick authored and torvalds committed Aug 8, 2014
1 parent de771bd commit 07bc94f
Showing 1 changed file with 18 additions and 18 deletions.
36 changes: 18 additions & 18 deletions fs/ufs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
goto again;
}
if (!silent)
pr_err("ufs_read_super: bad magic number\n");
pr_err("%s(): bad magic number\n", __func__);
goto failed;

magic_found:
Expand All @@ -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);

if (!is_power_of_2(uspi->s_fsize)) {
pr_err("ufs_read_super: fragment size %u is not a power of 2\n",
uspi->s_fsize);
pr_err("%s(): fragment size %u is not a power of 2\n",
__func__, uspi->s_fsize);
goto failed;
}
if (uspi->s_fsize < 512) {
pr_err("ufs_read_super: fragment size %u is too small\n",
uspi->s_fsize);
pr_err("%s(): fragment size %u is too small\n",
__func__, uspi->s_fsize);
goto failed;
}
if (uspi->s_fsize > 4096) {
pr_err("ufs_read_super: fragment size %u is too large\n",
uspi->s_fsize);
pr_err("%s(): fragment size %u is too large\n",
__func__, uspi->s_fsize);
goto failed;
}
if (!is_power_of_2(uspi->s_bsize)) {
pr_err("ufs_read_super: block size %u is not a power of 2\n",
uspi->s_bsize);
pr_err("%s(): block size %u is not a power of 2\n",
__func__, uspi->s_bsize);
goto failed;
}
if (uspi->s_bsize < 4096) {
pr_err("ufs_read_super: block size %u is too small\n",
uspi->s_bsize);
pr_err("%s(): block size %u is too small\n",
__func__, uspi->s_bsize);
goto failed;
}
if (uspi->s_bsize / uspi->s_fsize > 8) {
pr_err("ufs_read_super: too many fragments per block (%u)\n",
uspi->s_bsize / uspi->s_fsize);
pr_err("%s(): too many fragments per block (%u)\n",
__func__, uspi->s_bsize / uspi->s_fsize);
goto failed;
}
if (uspi->s_fsize != block_size || uspi->s_sbsize != super_block_size) {
Expand Down Expand Up @@ -1109,21 +1109,21 @@ static int ufs_fill_super(struct super_block *sb, void *data, int silent)
UFSD("fs is DEC OSF/1\n");
break;
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;
break;
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;
break;
default:
pr_err("ufs_read_super: can't grok fs_clean 0x%x\n",
usb1->fs_clean);
pr_err("%s(): can't grok fs_clean 0x%x\n",
__func__, usb1->fs_clean);
sb->s_flags |= MS_RDONLY;
break;
}
} else {
pr_err("ufs_read_super: fs needs fsck\n");
pr_err("%s(): fs needs fsck\n", __func__);
sb->s_flags |= MS_RDONLY;
}

Expand Down

0 comments on commit 07bc94f

Please sign in to comment.