diff options
| author | Dave Chinner <david@fromorbit.com> | 2015-02-24 10:24:07 +1100 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2015-02-24 10:24:07 +1100 |
| commit | 3cabb836d801c3ad791c2dc6be07ec5819ab0a37 (patch) | |
| tree | dbc5bff557d23e978fd3c8920c7d99d8c09fa272 /fs/xfs/xfs_error.h | |
| parent | 83d5f01858b56db69c8e4ca5389ef7c29bfdb5dd (diff) | |
| parent | 444a702231412e82fb1c09679adc159301e9242c (diff) | |
| download | op-kernel-dev-3cabb836d801c3ad791c2dc6be07ec5819ab0a37.zip op-kernel-dev-3cabb836d801c3ad791c2dc6be07ec5819ab0a37.tar.gz | |
Merge branch 'xfs-misc-fixes-for-4.1' into for-next
Diffstat (limited to 'fs/xfs/xfs_error.h')
| -rw-r--r-- | fs/xfs/xfs_error.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index 279a76e..c0394ed 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h @@ -40,25 +40,25 @@ extern void xfs_verifier_error(struct xfs_buf *bp); /* * Macros to set EFSCORRUPTED & return/branch. */ -#define XFS_WANT_CORRUPTED_GOTO(x,l) \ +#define XFS_WANT_CORRUPTED_GOTO(mp, x, l) \ { \ int fs_is_ok = (x); \ ASSERT(fs_is_ok); \ if (unlikely(!fs_is_ok)) { \ XFS_ERROR_REPORT("XFS_WANT_CORRUPTED_GOTO", \ - XFS_ERRLEVEL_LOW, NULL); \ + XFS_ERRLEVEL_LOW, mp); \ error = -EFSCORRUPTED; \ goto l; \ } \ } -#define XFS_WANT_CORRUPTED_RETURN(x) \ +#define XFS_WANT_CORRUPTED_RETURN(mp, x) \ { \ int fs_is_ok = (x); \ ASSERT(fs_is_ok); \ if (unlikely(!fs_is_ok)) { \ XFS_ERROR_REPORT("XFS_WANT_CORRUPTED_RETURN", \ - XFS_ERRLEVEL_LOW, NULL); \ + XFS_ERRLEVEL_LOW, mp); \ return -EFSCORRUPTED; \ } \ } |
