mirror of
https://github.com/torvalds/linux.git
synced 2024-11-18 10:01:43 +00:00
f9e0370648
The XFS_WANT_CORRUPT_* macros conceal subtle side effects such as the
creation of local variables and redirections of the code flow. This is
pretty ugly, so replace them with explicit XFS_IS_CORRUPT tests that
remove both of those ugly points. The change was performed with the
following coccinelle script:
@@
expression mp, test;
identifier label;
@@
- XFS_WANT_CORRUPTED_GOTO(mp, test, label);
+ if (XFS_IS_CORRUPT(mp, !test)) { error = -EFSCORRUPTED; goto label; }
@@
expression mp, test;
@@
- XFS_WANT_CORRUPTED_RETURN(mp, test);
+ if (XFS_IS_CORRUPT(mp, !test)) return -EFSCORRUPTED;
@@
expression mp, lval, rval;
@@
- XFS_IS_CORRUPT(mp, !(lval == rval))
+ XFS_IS_CORRUPT(mp, lval != rval)
@@
expression mp, e1, e2;
@@
- XFS_IS_CORRUPT(mp, !(e1 && e2))
+ XFS_IS_CORRUPT(mp, !e1 || !e2)
@@
expression e1, e2;
@@
- !(e1 == e2)
+ e1 != e2
@@
expression e1, e2, e3, e4, e5, e6;
@@
- !(e1 == e2 && e3 == e4) || e5 != e6
+ e1 != e2 || e3 != e4 || e5 != e6
@@
expression e1, e2, e3, e4, e5, e6;
@@
- !(e1 == e2 || (e3 <= e4 && e5 <= e6))
+ e1 != e2 && (e3 > e4 || e5 > e6)
@@
expression mp, e1, e2;
@@
- XFS_IS_CORRUPT(mp, !(e1 <= e2))
+ XFS_IS_CORRUPT(mp, e1 > e2)
@@
expression mp, e1, e2;
@@
- XFS_IS_CORRUPT(mp, !(e1 < e2))
+ XFS_IS_CORRUPT(mp, e1 >= e2)
@@
expression mp, e1;
@@
- XFS_IS_CORRUPT(mp, !!e1)
+ XFS_IS_CORRUPT(mp, e1)
@@
expression mp, e1, e2;
@@
- XFS_IS_CORRUPT(mp, !(e1 || e2))
+ XFS_IS_CORRUPT(mp, !e1 && !e2)
@@
expression mp, e1, e2, e3, e4;
@@
- XFS_IS_CORRUPT(mp, !(e1 == e2) && !(e3 == e4))
+ XFS_IS_CORRUPT(mp, e1 != e2 && e3 != e4)
@@
expression mp, e1, e2, e3, e4;
@@
- XFS_IS_CORRUPT(mp, !(e1 <= e2) || !(e3 >= e4))
+ XFS_IS_CORRUPT(mp, e1 > e2 || e3 < e4)
@@
expression mp, e1, e2, e3, e4;
@@
- XFS_IS_CORRUPT(mp, !(e1 == e2) && !(e3 <= e4))
+ XFS_IS_CORRUPT(mp, e1 != e2 && e3 > e4)
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
79 lines
2.8 KiB
C
79 lines
2.8 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
|
|
* All Rights Reserved.
|
|
*/
|
|
#ifndef __XFS_ERROR_H__
|
|
#define __XFS_ERROR_H__
|
|
|
|
struct xfs_mount;
|
|
|
|
extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp,
|
|
const char *filename, int linenum,
|
|
xfs_failaddr_t failaddr);
|
|
extern void xfs_corruption_error(const char *tag, int level,
|
|
struct xfs_mount *mp, const void *buf, size_t bufsize,
|
|
const char *filename, int linenum,
|
|
xfs_failaddr_t failaddr);
|
|
void xfs_buf_corruption_error(struct xfs_buf *bp);
|
|
extern void xfs_buf_verifier_error(struct xfs_buf *bp, int error,
|
|
const char *name, const void *buf, size_t bufsz,
|
|
xfs_failaddr_t failaddr);
|
|
extern void xfs_verifier_error(struct xfs_buf *bp, int error,
|
|
xfs_failaddr_t failaddr);
|
|
extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error,
|
|
const char *name, const void *buf, size_t bufsz,
|
|
xfs_failaddr_t failaddr);
|
|
|
|
#define XFS_ERROR_REPORT(e, lvl, mp) \
|
|
xfs_error_report(e, lvl, mp, __FILE__, __LINE__, __return_address)
|
|
#define XFS_CORRUPTION_ERROR(e, lvl, mp, buf, bufsize) \
|
|
xfs_corruption_error(e, lvl, mp, buf, bufsize, \
|
|
__FILE__, __LINE__, __return_address)
|
|
|
|
#define XFS_ERRLEVEL_OFF 0
|
|
#define XFS_ERRLEVEL_LOW 1
|
|
#define XFS_ERRLEVEL_HIGH 5
|
|
|
|
/* Dump 128 bytes of any corrupt buffer */
|
|
#define XFS_CORRUPTION_DUMP_LEN (128)
|
|
|
|
#ifdef DEBUG
|
|
extern int xfs_errortag_init(struct xfs_mount *mp);
|
|
extern void xfs_errortag_del(struct xfs_mount *mp);
|
|
extern bool xfs_errortag_test(struct xfs_mount *mp, const char *expression,
|
|
const char *file, int line, unsigned int error_tag);
|
|
#define XFS_TEST_ERROR(expr, mp, tag) \
|
|
((expr) || xfs_errortag_test((mp), #expr, __FILE__, __LINE__, (tag)))
|
|
|
|
extern int xfs_errortag_get(struct xfs_mount *mp, unsigned int error_tag);
|
|
extern int xfs_errortag_set(struct xfs_mount *mp, unsigned int error_tag,
|
|
unsigned int tag_value);
|
|
extern int xfs_errortag_add(struct xfs_mount *mp, unsigned int error_tag);
|
|
extern int xfs_errortag_clearall(struct xfs_mount *mp);
|
|
#else
|
|
#define xfs_errortag_init(mp) (0)
|
|
#define xfs_errortag_del(mp)
|
|
#define XFS_TEST_ERROR(expr, mp, tag) (expr)
|
|
#define xfs_errortag_set(mp, tag, val) (ENOSYS)
|
|
#define xfs_errortag_add(mp, tag) (ENOSYS)
|
|
#define xfs_errortag_clearall(mp) (ENOSYS)
|
|
#endif /* DEBUG */
|
|
|
|
/*
|
|
* XFS panic tags -- allow a call to xfs_alert_tag() be turned into
|
|
* a panic by setting xfs_panic_mask in a sysctl.
|
|
*/
|
|
#define XFS_NO_PTAG 0
|
|
#define XFS_PTAG_IFLUSH 0x00000001
|
|
#define XFS_PTAG_LOGRES 0x00000002
|
|
#define XFS_PTAG_AILDELETE 0x00000004
|
|
#define XFS_PTAG_ERROR_REPORT 0x00000008
|
|
#define XFS_PTAG_SHUTDOWN_CORRUPT 0x00000010
|
|
#define XFS_PTAG_SHUTDOWN_IOERROR 0x00000020
|
|
#define XFS_PTAG_SHUTDOWN_LOGERROR 0x00000040
|
|
#define XFS_PTAG_FSBLOCK_ZERO 0x00000080
|
|
#define XFS_PTAG_VERIFIER_ERROR 0x00000100
|
|
|
|
#endif /* __XFS_ERROR_H__ */
|