aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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:
1030 goto again; 1030 goto again;
1031 } 1031 }
1032 if (!silent) 1032 if (!silent)
1033 pr_err("ufs_read_super: bad magic number\n"); 1033 pr_err("%s(): bad magic number\n", __func__);
1034 goto failed; 1034 goto failed;
1035 1035
1036magic_found: 1036magic_found:
@@ -1044,33 +1044,33 @@ magic_found:
1044 uspi->s_fshift = fs32_to_cpu(sb, usb1->fs_fshift); 1044 uspi->s_fshift = fs32_to_cpu(sb, usb1->fs_fshift);
1045 1045
1046 if (!is_power_of_2(uspi->s_fsize)) { 1046 if (!is_power_of_2(uspi->s_fsize)) {
1047 pr_err("ufs_read_super: fragment size %u is not a power of 2\n", 1047 pr_err("%s(): fragment size %u is not a power of 2\n",
1048 uspi->s_fsize); 1048 __func__, uspi->s_fsize);
1049 goto failed; 1049 goto failed;
1050 } 1050 }
1051 if (uspi->s_fsize < 512) { 1051 if (uspi->s_fsize < 512) {
1052 pr_err("ufs_read_super: fragment size %u is too small\n", 1052 pr_err("%s(): fragment size %u is too small\n",
1053 uspi->s_fsize); 1053 __func__, uspi->s_fsize);
1054 goto failed; 1054 goto failed;
1055 } 1055 }
1056 if (uspi->s_fsize > 4096) { 1056 if (uspi->s_fsize > 4096) {
1057 pr_err("ufs_read_super: fragment size %u is too large\n", 1057 pr_err("%s(): fragment size %u is too large\n",
1058 uspi->s_fsize); 1058 __func__, uspi->s_fsize);
1059 goto failed; 1059 goto failed;
1060 } 1060 }
1061 if (!is_power_of_2(uspi->s_bsize)) { 1061 if (!is_power_of_2(uspi->s_bsize)) {
1062 pr_err("ufs_read_super: block size %u is not a power of 2\n", 1062 pr_err("%s(): block size %u is not a power of 2\n",
1063 uspi->s_bsize); 1063 __func__, uspi->s_bsize);
1064 goto failed; 1064 goto failed;
1065 } 1065 }
1066 if (uspi->s_bsize < 4096) { 1066 if (uspi->s_bsize < 4096) {
1067 pr_err("ufs_read_super: block size %u is too small\n", 1067 pr_err("%s(): block size %u is too small\n",
1068 uspi->s_bsize); 1068 __func__, uspi->s_bsize);
1069 goto failed; 1069 goto failed;
1070 } 1070 }
1071 if (uspi->s_bsize / uspi->s_fsize > 8) { 1071 if (uspi->s_bsize / uspi->s_fsize > 8) {
1072 pr_err("ufs_read_super: too many fragments per block (%u)\n", 1072 pr_err("%s(): too many fragments per block (%u)\n",
1073 uspi->s_bsize / uspi->s_fsize); 1073 __func__, uspi->s_bsize / uspi->s_fsize);
1074 goto failed; 1074 goto failed;
1075 } 1075 }
1076 if (uspi->s_fsize != block_size || uspi->s_sbsize != super_block_size) { 1076 if (uspi->s_fsize != block_size || uspi->s_sbsize != super_block_size) {
@@ -1109,21 +1109,21 @@ magic_found:
1109 UFSD("fs is DEC OSF/1\n"); 1109 UFSD("fs is DEC OSF/1\n");
1110 break; 1110 break;
1111 case UFS_FSACTIVE: 1111 case UFS_FSACTIVE:
1112 pr_err("ufs_read_super: fs is active\n"); 1112 pr_err("%s(): fs is active\n", __func__);
1113 sb->s_flags |= MS_RDONLY; 1113 sb->s_flags |= MS_RDONLY;
1114 break; 1114 break;
1115 case UFS_FSBAD: 1115 case UFS_FSBAD:
1116 pr_err("ufs_read_super: fs is bad\n"); 1116 pr_err("%s(): fs is bad\n", __func__);
1117 sb->s_flags |= MS_RDONLY; 1117 sb->s_flags |= MS_RDONLY;
1118 break; 1118 break;
1119 default: 1119 default:
1120 pr_err("ufs_read_super: can't grok fs_clean 0x%x\n", 1120 pr_err("%s(): can't grok fs_clean 0x%x\n",
1121 usb1->fs_clean); 1121 __func__, usb1->fs_clean);
1122 sb->s_flags |= MS_RDONLY; 1122 sb->s_flags |= MS_RDONLY;
1123 break; 1123 break;
1124 } 1124 }
1125 } else { 1125 } else {
1126 pr_err("ufs_read_super: fs needs fsck\n"); 1126 pr_err("%s(): fs needs fsck\n", __func__);
1127 sb->s_flags |= MS_RDONLY; 1127 sb->s_flags |= MS_RDONLY;
1128 } 1128 }
1129 1129