summaryrefslogtreecommitdiff
path: root/fs/ufs
diff options
context:
space:
mode:
authorFabian Frederick <fabf@skynet.be>2014-08-08 14:21:01 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-08-08 15:57:21 -0700
commit07bc94fdb4dc86d7008ab6b48ea410cbe72c96c3 (patch)
tree09b836873ae265617171cfc417857cbfd6ad35af /fs/ufs
parentde771bdaaa9dd2585c59e1bd6cf2cac83aa0beec (diff)
downloadlwn-07bc94fdb4dc86d7008ab6b48ea410cbe72c96c3.tar.gz
lwn-07bc94fdb4dc86d7008ab6b48ea410cbe72c96c3.zip
fs/ufs/super.c: use __func__ in logging
Replace approximate function name by __func__ using standard format "function():" Signed-off-by: Fabian Frederick <fabf@skynet.be> Cc: Evgeniy Dushistov <dushistov@mail.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ufs')
-rw-r--r--fs/ufs/super.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c
index cfa878e3d5e3..ca2455748ef5 100644
--- a/fs/ufs/super.c
+++ b/fs/ufs/super.c
@@ -1030,7 +1030,7 @@ again:
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:
@@ -1044,33 +1044,33 @@ magic_found:
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) {
@@ -1109,21 +1109,21 @@ magic_found:
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;
}