← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to fs/xfs/xfs_error.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
fs/xfs/xfs_error.c
48
48
                        break;
49
49
                if (e != xfs_etrap[i])
50
50
                        continue;
51
 
                cmn_err(CE_NOTE, "xfs_error_trap: error %d", e);
 
51
                xfs_notice(NULL, "%s: error %d", __func__, e);
52
52
                BUG();
53
53
                break;
54
54
        }
74
74
 
75
75
        for (i = 0; i < XFS_NUM_INJECT_ERROR; i++)  {
76
76
                if (xfs_etest[i] == error_tag && xfs_etest_fsid[i] == fsid) {
77
 
                        cmn_err(CE_WARN,
 
77
                        xfs_warn(NULL,
78
78
        "Injecting error (%s) at file %s, line %d, on filesystem \"%s\"",
79
79
                                expression, file, line, xfs_etest_fsname[i]);
80
80
                        return 1;
95
95
 
96
96
        for (i = 0; i < XFS_NUM_INJECT_ERROR; i++)  {
97
97
                if (xfs_etest_fsid[i] == fsid && xfs_etest[i] == error_tag) {
98
 
                        cmn_err(CE_WARN, "XFS error tag #%d on", error_tag);
 
98
                        xfs_warn(mp, "error tag #%d on", error_tag);
99
99
                        return 0;
100
100
                }
101
101
        }
102
102
 
103
103
        for (i = 0; i < XFS_NUM_INJECT_ERROR; i++)  {
104
104
                if (xfs_etest[i] == 0) {
105
 
                        cmn_err(CE_WARN, "Turned on XFS error tag #%d",
 
105
                        xfs_warn(mp, "Turned on XFS error tag #%d",
106
106
                                error_tag);
107
107
                        xfs_etest[i] = error_tag;
108
108
                        xfs_etest_fsid[i] = fsid;
114
114
                }
115
115
        }
116
116
 
117
 
        cmn_err(CE_WARN, "error tag overflow, too many turned on");
 
117
        xfs_warn(mp, "error tag overflow, too many turned on");
118
118
 
119
119
        return 1;
120
120
}
133
133
                if ((fsid == 0LL || xfs_etest_fsid[i] == fsid) &&
134
134
                     xfs_etest[i] != 0) {
135
135
                        cleared = 1;
136
 
                        cmn_err(CE_WARN, "Clearing XFS error tag #%d",
 
136
                        xfs_warn(mp, "Clearing XFS error tag #%d",
137
137
                                xfs_etest[i]);
138
138
                        xfs_etest[i] = 0;
139
139
                        xfs_etest_fsid[i] = 0LL;
144
144
        }
145
145
 
146
146
        if (loud || cleared)
147
 
                cmn_err(CE_WARN,
148
 
                        "Cleared all XFS error tags for filesystem \"%s\"",
149
 
                        mp->m_fsname);
 
147
                xfs_warn(mp, "Cleared all XFS error tags for filesystem");
150
148
 
151
149
        return 0;
152
150
}
162
160
        inst_t                  *ra)
163
161
{
164
162
        if (level <= xfs_error_level) {
165
 
                xfs_cmn_err(XFS_PTAG_ERROR_REPORT,
166
 
                            CE_ALERT, mp,
167
 
                "XFS internal error %s at line %d of file %s.  Caller 0x%p\n",
 
163
                xfs_alert_tag(mp, XFS_PTAG_ERROR_REPORT,
 
164
                "Internal error %s at line %d of file %s.  Caller 0x%p\n",
168
165
                            tag, linenum, filename, ra);
169
166
 
170
167
                xfs_stack_trace();
184
181
        if (level <= xfs_error_level)
185
182
                xfs_hex_dump(p, 16);
186
183
        xfs_error_report(tag, level, mp, filename, linenum, ra);
 
184
        xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair");
187
185
}