-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits) xfs: don't name variables "panic" xfs: factor agf counter updates into a helper xfs: clean up the xfs_alloc_compute_aligned calling convention xfs: kill support/debug.[ch] xfs: Convert remaining cmn_err() callers to new API xfs: convert the quota debug prints to new API xfs: rename xfs_cmn_err_fsblock_zero() xfs: convert xfs_fs_cmn_err to new error logging API xfs: kill xfs_fs_mount_cmn_err() macro xfs: kill xfs_fs_repair_cmn_err() macro xfs: convert xfs_cmn_err to xfs_alert_tag xfs: Convert xlog_warn to new logging interface xfs: Convert linux-2.6/ files to new logging interface xfs: introduce new logging API. xfs: zero proper structure size for geometry calls xfs: enable delaylog by default xfs: more sensible inode refcounting for ialloc xfs: stop using xfs_trans_iget in the RT allocator xfs: check if device support discard in xfs_ioc_trim() xfs: prevent leaking uninitialized stack memory in FSGEOMETRY_V1 ...
- Loading branch information
Showing
46 changed files
with
947 additions
and
1,079 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| /* | ||
| * 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_types.h" | ||
| #include "xfs_log.h" | ||
| #include "xfs_inum.h" | ||
| #include "xfs_trans.h" | ||
| #include "xfs_sb.h" | ||
| #include "xfs_ag.h" | ||
| #include "xfs_mount.h" | ||
|
|
||
| /* | ||
| * XFS logging functions | ||
| */ | ||
| static int | ||
| __xfs_printk( | ||
| const char *level, | ||
| const struct xfs_mount *mp, | ||
| struct va_format *vaf) | ||
| { | ||
| if (mp && mp->m_fsname) | ||
| return printk("%sXFS (%s): %pV\n", level, mp->m_fsname, vaf); | ||
| return printk("%sXFS: %pV\n", level, vaf); | ||
| } | ||
|
|
||
| int xfs_printk( | ||
| const char *level, | ||
| const struct xfs_mount *mp, | ||
| const char *fmt, ...) | ||
| { | ||
| struct va_format vaf; | ||
| va_list args; | ||
| int r; | ||
|
|
||
| va_start(args, fmt); | ||
|
|
||
| vaf.fmt = fmt; | ||
| vaf.va = &args; | ||
|
|
||
| r = __xfs_printk(level, mp, &vaf); | ||
| va_end(args); | ||
|
|
||
| return r; | ||
| } | ||
|
|
||
| #define define_xfs_printk_level(func, kern_level) \ | ||
| int func(const struct xfs_mount *mp, const char *fmt, ...) \ | ||
| { \ | ||
| struct va_format vaf; \ | ||
| va_list args; \ | ||
| int r; \ | ||
| \ | ||
| va_start(args, fmt); \ | ||
| \ | ||
| vaf.fmt = fmt; \ | ||
| vaf.va = &args; \ | ||
| \ | ||
| r = __xfs_printk(kern_level, mp, &vaf); \ | ||
| va_end(args); \ | ||
| \ | ||
| return r; \ | ||
| } \ | ||
|
|
||
| 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 | ||
|
|
||
| int | ||
| 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; | ||
| int r; | ||
|
|
||
| if (xfs_panic_mask && (xfs_panic_mask & panic_tag)) { | ||
| xfs_printk(KERN_ALERT, mp, | ||
| "XFS: Transforming an alert into a BUG."); | ||
| do_panic = 1; | ||
| } | ||
|
|
||
| va_start(args, fmt); | ||
|
|
||
| vaf.fmt = fmt; | ||
| vaf.va = &args; | ||
|
|
||
| r = __xfs_printk(KERN_ALERT, mp, &vaf); | ||
| va_end(args); | ||
|
|
||
| BUG_ON(do_panic); | ||
|
|
||
| return r; | ||
| } | ||
|
|
||
| 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); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| #ifndef __XFS_MESSAGE_H | ||
| #define __XFS_MESSAGE_H 1 | ||
|
|
||
| struct xfs_mount; | ||
|
|
||
| extern int xfs_printk(const char *level, const struct xfs_mount *mp, | ||
| const char *fmt, ...) | ||
| __attribute__ ((format (printf, 3, 4))); | ||
| extern int xfs_emerg(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| extern int xfs_alert(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| extern int xfs_alert_tag(const struct xfs_mount *mp, int tag, | ||
| const char *fmt, ...) | ||
| __attribute__ ((format (printf, 3, 4))); | ||
| extern int xfs_crit(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| extern int xfs_err(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| extern int xfs_warn(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| extern int xfs_notice(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| extern int xfs_info(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
|
|
||
| #ifdef DEBUG | ||
| extern int xfs_debug(const struct xfs_mount *mp, const char *fmt, ...) | ||
| __attribute__ ((format (printf, 2, 3))); | ||
| #else | ||
| #define xfs_debug(mp, fmt, ...) (0) | ||
| #endif | ||
|
|
||
| extern void assfail(char *expr, char *f, int l); | ||
|
|
||
| extern void xfs_hex_dump(void *p, int length); | ||
|
|
||
| #endif /* __XFS_MESSAGE_H */ |
Oops, something went wrong.