Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[pandora-kernel.git] / fs / xfs / xfs_error.c

diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c
index f227ecd..047b8a8 100644 (file)
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
@@ -153,21 +153,6 @@ xfs_errortag_clearall(xfs_mount_t *mp, int loud)
 }
 #endif /* DEBUG */
 
-static void
-xfs_fs_vcmn_err(int level, xfs_mount_t *mp, char *fmt, va_list ap)
-{
-       if (mp != NULL) {
-               char    *newfmt;
-               int     len = 16 + mp->m_fsname_len + strlen(fmt);
-
-               newfmt = kmem_alloc(len, KM_SLEEP);
-               sprintf(newfmt, "Filesystem \"%s\": %s", mp->m_fsname, fmt);
-               icmn_err(level, newfmt, ap);
-               kmem_free(newfmt);
-       } else {
-               icmn_err(level, fmt, ap);
-       }
-}
 
 void
 xfs_fs_cmn_err(int level, xfs_mount_t *mp, char *fmt, ...)
@@ -185,7 +170,7 @@ xfs_cmn_err(int panic_tag, int level, xfs_mount_t *mp, char *fmt, ...)
        va_list ap;
 
 #ifdef DEBUG
-       xfs_panic_mask |= XFS_PTAG_SHUTDOWN_CORRUPT;
+       xfs_panic_mask |= (XFS_PTAG_SHUTDOWN_CORRUPT | XFS_PTAG_LOGRES);
 #endif
 
        if (xfs_panic_mask && (xfs_panic_mask & panic_tag)
@@ -201,18 +186,18 @@ xfs_cmn_err(int panic_tag, int level, xfs_mount_t *mp, char *fmt, ...)
 
 void
 xfs_error_report(
-       char            *tag,
-       int             level,
-       xfs_mount_t     *mp,
-       char            *fname,
-       int             linenum,
-       inst_t          *ra)
+       const char              *tag,
+       int                     level,
+       struct xfs_mount        *mp,
+       const char              *filename,
+       int                     linenum,
+       inst_t                  *ra)
 {
        if (level <= xfs_error_level) {
                xfs_cmn_err(XFS_PTAG_ERROR_REPORT,
                            CE_ALERT, mp,
                "XFS internal error %s at line %d of file %s.  Caller 0x%p\n",
-                           tag, linenum, fname, ra);
+                           tag, linenum, filename, ra);
 
                xfs_stack_trace();
        }
@@ -220,15 +205,15 @@ xfs_error_report(
 
 void
 xfs_corruption_error(
-       char            *tag,
-       int             level,
-       xfs_mount_t     *mp,
-       void            *p,
-       char            *fname,
-       int             linenum,
-       inst_t          *ra)
+       const char              *tag,
+       int                     level,
+       struct xfs_mount        *mp,
+       void                    *p,
+       const char              *filename,
+       int                     linenum,
+       inst_t                  *ra)
 {
        if (level <= xfs_error_level)
                xfs_hex_dump(p, 16);
-       xfs_error_report(tag, level, mp, fname, linenum, ra);
+       xfs_error_report(tag, level, mp, filename, linenum, ra);
 }