239880ef64
xfs_trans.h has a dependency on xfs_log.h for a couple of structures. Most code that does transactions doesn't need to know anything about the log, but this dependency means that they have to include xfs_log.h. Decouple the xfs_trans.h and xfs_log.h header files and clean up the includes to be in dependency order. In doing this, remove the direct include of xfs_trans_reserve.h from xfs_trans.h so that we remove the dependency between xfs_trans.h and xfs_mount.h. Hence the xfs_trans.h include can be moved to the indicate the actual dependencies other header files have on it. Note that these are kernel only header files, so this does not translate to any userspace changes at all. Signed-off-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Ben Myers <bpm@sgi.com> Signed-off-by: Ben Myers <bpm@sgi.com>
114 lines
2.6 KiB
C
114 lines
2.6 KiB
C
/*
|
|
* Copyright (c) 2011 Red Hat, Inc. All Rights Reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it would be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write the Free Software Foundation,
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "xfs.h"
|
|
#include "xfs_fs.h"
|
|
#include "xfs_log_format.h"
|
|
#include "xfs_trans_resv.h"
|
|
#include "xfs_sb.h"
|
|
#include "xfs_ag.h"
|
|
#include "xfs_mount.h"
|
|
|
|
/*
|
|
* XFS logging functions
|
|
*/
|
|
static void
|
|
__xfs_printk(
|
|
const char *level,
|
|
const struct xfs_mount *mp,
|
|
struct va_format *vaf)
|
|
{
|
|
if (mp && mp->m_fsname) {
|
|
printk("%sXFS (%s): %pV\n", level, mp->m_fsname, vaf);
|
|
return;
|
|
}
|
|
printk("%sXFS: %pV\n", level, vaf);
|
|
}
|
|
|
|
#define define_xfs_printk_level(func, kern_level) \
|
|
void func(const struct xfs_mount *mp, const char *fmt, ...) \
|
|
{ \
|
|
struct va_format vaf; \
|
|
va_list args; \
|
|
\
|
|
va_start(args, fmt); \
|
|
\
|
|
vaf.fmt = fmt; \
|
|
vaf.va = &args; \
|
|
\
|
|
__xfs_printk(kern_level, mp, &vaf); \
|
|
va_end(args); \
|
|
} \
|
|
|
|
define_xfs_printk_level(xfs_emerg, KERN_EMERG);
|
|
define_xfs_printk_level(xfs_alert, KERN_ALERT);
|
|
define_xfs_printk_level(xfs_crit, KERN_CRIT);
|
|
define_xfs_printk_level(xfs_err, KERN_ERR);
|
|
define_xfs_printk_level(xfs_warn, KERN_WARNING);
|
|
define_xfs_printk_level(xfs_notice, KERN_NOTICE);
|
|
define_xfs_printk_level(xfs_info, KERN_INFO);
|
|
#ifdef DEBUG
|
|
define_xfs_printk_level(xfs_debug, KERN_DEBUG);
|
|
#endif
|
|
|
|
void
|
|
xfs_alert_tag(
|
|
const struct xfs_mount *mp,
|
|
int panic_tag,
|
|
const char *fmt, ...)
|
|
{
|
|
struct va_format vaf;
|
|
va_list args;
|
|
int do_panic = 0;
|
|
|
|
if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) {
|
|
xfs_alert(mp, "Transforming an alert into a BUG.");
|
|
do_panic = 1;
|
|
}
|
|
|
|
va_start(args, fmt);
|
|
|
|
vaf.fmt = fmt;
|
|
vaf.va = &args;
|
|
|
|
__xfs_printk(KERN_ALERT, mp, &vaf);
|
|
va_end(args);
|
|
|
|
BUG_ON(do_panic);
|
|
}
|
|
|
|
void
|
|
asswarn(char *expr, char *file, int line)
|
|
{
|
|
xfs_warn(NULL, "Assertion failed: %s, file: %s, line: %d",
|
|
expr, file, line);
|
|
WARN_ON(1);
|
|
}
|
|
|
|
void
|
|
assfail(char *expr, char *file, int line)
|
|
{
|
|
xfs_emerg(NULL, "Assertion failed: %s, file: %s, line: %d",
|
|
expr, file, line);
|
|
BUG();
|
|
}
|
|
|
|
void
|
|
xfs_hex_dump(void *p, int length)
|
|
{
|
|
print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_ADDRESS, 16, 1, p, length, 1);
|
|
}
|