xfs: refactor corruption checking and reporting
cover xfs: refactor corruption checking and reporting
Hi all,
In this second series, we refactor the code that XFS uses to determine that it is dealing with corrupt metadata and report that to userspace.
As usual, the first 4 patches perform some small cleanups to lay the groundwork for the meat of the series, which are in the last two patches.
The fifth patch replaces the XFS_WANT_CORRUPT* macros with open-coded versions because it's a little strange that a thing that looks like a simple function call actually has series effects on code flow.
The sixth patch cleans up all the "if (bad) { XFS_ERROR_REPORT..." code by combining that into a single XFS_CORRUPT_ON macro that does all that logging. This cleans up the error handling code blocks some more.
This has been lightly tested with fstests. Enjoy! Comments and questions are, as always, welcome.
--D
PATCH 1/6 xfs: decrease indenting problems in xfs_dabuf_map
From: Darrick J. Wong <[email protected]>
Refactor the code that complains when a dir/attr mapping doesn't exist but the caller requires a mapping. This small restructuring helps us to reduce the indenting level.
--- fs/xfs/libxfs/xfs_da_btree.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-)
fs/xfs/libxfs/xfs_da_btree.c +21 -17
@@ -2567,26 +2567,30 @@ xfs_dabuf_map( }if (!xfs_da_map_covers_blocks (nirecs, irecs, bno, nfsb)) { - error = mappedbno ==-2 ?-1 : -EFSCORRUPTED ; -if (unlikely (error == -EFSCORRUPTED )) { -if (xfs_error_level >=XFS_ERRLEVEL_LOW ) { -int i; -xfs_alert (mp,"%s: bno %lld dir: inode %lld" , - __func__, (long long )bno, - (long long )dp->i_ino); -for (i =0 ; i < *nmaps; i++) { -xfs_alert (mp, +/* Caller ok with no mapping. */ +if (mappedbno ==-2 ) { + error =-1 ; + goto out; + } + +/* Caller expected a mapping, so abort. */ +if (xfs_error_level >=XFS_ERRLEVEL_LOW ) { +int i; + +xfs_alert (mp,"%s: bno %lld dir: inode %lld" , __func__, + (long long )bno, (long long )dp->i_ino); +for (i =0 ; i < *nmaps; i++) { +xfs_alert (mp,"[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d" , - i, - (long long )irecs[i].br_startoff, - (long long )irecs[i].br_startblock, - (long long )irecs[i].br_blockcount, - irecs[i].br_state); - } + i, + (long long )irecs[i].br_startoff, + (long long )irecs[i].br_startblock, + (long long )irecs[i].br_blockcount, + irecs[i].br_state); } -XFS_ERROR_REPORT ("xfs_da_do_buf(1)" , -XFS_ERRLEVEL_LOW , mp); } +XFS_ERROR_REPORT ("xfs_da_do_buf(1)" ,XFS_ERRLEVEL_LOW , mp); + error = -EFSCORRUPTED ; goto out; } error =xfs_buf_map_from_irec (mp, map, nmaps, irecs, nirecs);
Re: [PATCH 1/6] xfs: decrease indenting problems in xfs_dabuf_map
Quoted 5 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Refactor the code that complains when a dir/attr mapping doesn't exist but the caller requires a mapping. This small restructuring helps us to reduce the indenting level.
I have to say I hate the calling convention here.. But the actual change is perfectly fine, so:
PATCH 2/6 xfs: add missing assert in xfs_fsmap_owner_from_rmap
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
The fsmap handler shouldn't fail silently if the rmap code ever feeds it a special owner number that isn't known to the fsmap handler.
--- fs/xfs/xfs_fsmap.c | 1 + 1 file changed, 1 insertion(+)
fs/xfs/xfs_fsmap.c +1 -0
@@ -146,6 +146,7 @@ xfs_fsmap_owner_from_rmap( dest->fmr_owner =XFS_FMR_OWN_FREE ;break ;default : +ASSERT (0 );return -EFSCORRUPTED ; }return 0 ;
Re: [PATCH 2/6] xfs: add missing assert in xfs_fsmap_owner_from_rmap
Quoted 6 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
The fsmap handler shouldn't fail silently if the rmap code ever feeds it a special owner number that isn't known to the fsmap handler.
Signed-off-by Darrick J. Wong <[email protected]>
Looks fine,
PATCH 3/6 xfs: make the assertion message functions take a mount parameter
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Make the assfail and asswarn functions take a struct xfs_mount so that we can start tying debugging and corruption messages to a particular mount.
--- fs/xfs/xfs_linux.h | 6 +++--- fs/xfs/xfs_message.c | 8 ++++---- fs/xfs/xfs_message.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-)
fs/xfs/xfs_linux.h +3 -3
@@ -223,18 +223,18 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count, char *data, unsigned int op);#define ASSERT_ALWAYS (expr) \ - (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))#ifdef DEBUG #define ASSERT (expr) \ - (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))#else /* !DEBUG */ #ifdef XFS_WARN #define ASSERT (expr) \ - (likely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__)) + (likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__))#else /* !DEBUG && !XFS_WARN */
fs/xfs/xfs_message.c +4 -4
@@ -86,17 +86,17 @@ xfs_alert_tag( }void -asswarn (char *expr,char *file,int line) +asswarn (struct xfs_mount *mp,char *expr,char *file,int line) { -xfs_warn (NULL ,"Assertion failed: %s, file: %s, line: %d" , +xfs_warn (mp,"Assertion failed: %s, file: %s, line: %d" , expr, file, line);WARN_ON (1 ); }void -assfail (char *expr,char *file,int line) +assfail (struct xfs_mount *mp,char *expr,char *file,int line) { -xfs_emerg (NULL ,"Assertion failed: %s, file: %s, line: %d" , +xfs_emerg (mp,"Assertion failed: %s, file: %s, line: %d" , expr, file, line);if (xfs_globals.bug_on_assert)BUG ();
fs/xfs/xfs_message.h +2 -2
@@ -57,8 +57,8 @@ do { \#define xfs_debug_ratelimited (dev, fmt, ...) \ xfs_printk_ratelimited(xfs_debug, dev, fmt, ##__VA_ARGS__) -extern void assfail (char *expr,char *f,int l); -extern void asswarn (char *expr,char *f,int l); +extern void assfail (struct xfs_mount *mp,char *expr,char *f,int l); +extern void asswarn (struct xfs_mount *mp,char *expr,char *f,int l);extern void xfs_hex_dump (const void *p,int length);
Re: [PATCH 3/6] xfs: make the assertion message functions take a mount parameter
fs/xfs/xfs_message.c xfs_alert_tag( · line 97
Quoted 13 lines
void
fs/xfs/xfs_message.c +3
-3-asswarn(char *expr, char *file, int line) +asswarn(struct xfs_mount *mp, char *expr, char *file, int line) { -xfs_warn (NULL ,"Assertion failed: %s, file: %s, line: %d" , + xfs_warn(mp, "Assertion failed: %s, file: %s, line: %d", expr, file, line);WARN_ON (1 ); }void -assfail (char *expr,char *file,int line) +assfail (struct xfs_mount *mp,char *expr,char *file,int line)
Might be worth to change it to our usual prototype style while you're at it.
fs/xfs/xfs_message.h do { \ · line 61
Quoted 4 lines
fs/xfs/xfs_message.h +2
-2-extern void assfail (char *expr,char *f,int l); -extern void asswarn (char *expr,char *f,int l); +extern void assfail (struct xfs_mount *mp,char *expr,char *f,int l); +extern void asswarn (struct xfs_mount *mp,char *expr,char *f,int l);
And drop the pointless externs?
Otherwise this looks sane to me.
Re: [PATCH 3/6] xfs: make the assertion message functions take a mount parameter
Quoted 17 lines · Christoph Hellwig
fs/xfs/xfs_message.c xfs_alert_tag( · line 97
Quoted 13 lines
void
fs/xfs/xfs_message.c +3
-3-asswarn(char *expr, char *file, int line) +asswarn(struct xfs_mount *mp, char *expr, char *file, int line) { -xfs_warn (NULL ,"Assertion failed: %s, file: %s, line: %d" , + xfs_warn(mp, "Assertion failed: %s, file: %s, line: %d", expr, file, line);WARN_ON (1 ); }void -assfail (char *expr,char *file,int line) +assfail (struct xfs_mount *mp,char *expr,char *file,int line)Might be worth to change it to our usual prototype style while you're at it.
Quoted 8 lines
fs/xfs/xfs_message.h do { \ · line 61
Quoted 4 lines
fs/xfs/xfs_message.h +2
-2-extern void assfail (char *expr,char *f,int l); -extern void asswarn (char *expr,char *f,int l); +extern void assfail (struct xfs_mount *mp,char *expr,char *f,int l); +extern void asswarn (struct xfs_mount *mp,char *expr,char *f,int l);And drop the pointless externs?
Otherwise this looks sane to me.
Fixed both of those.
--D
PATCH v2 3/6 xfs: make the assertion message functions take a mount parameter
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Make the assfail and asswarn functions take a struct xfs_mount so that we can start tying debugging and corruption messages to a particular mount.
---
v2: fix indentation and drop externs
--- fs/xfs/xfs_linux.h | 6 +++--- fs/xfs/xfs_message.c | 16 ++++++++++++---- fs/xfs/xfs_message.h | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-)
fs/xfs/xfs_linux.h +3 -3
@@ -223,18 +223,18 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count, char *data, unsigned int op);#define ASSERT_ALWAYS (expr) \ - (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))#ifdef DEBUG #define ASSERT (expr) \ - (likely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__))#else /* !DEBUG */ #ifdef XFS_WARN #define ASSERT (expr) \ - (likely(expr) ? (void)0 : asswarn(#expr, __FILE__, __LINE__)) + (likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__))#else /* !DEBUG && !XFS_WARN */
fs/xfs/xfs_message.c +12 -4
@@ -86,17 +86,25 @@ xfs_alert_tag( }void -asswarn (char *expr,char *file,int line) +asswarn ( +struct xfs_mount *mp, +char *expr, +char *file, +int line) { -xfs_warn (NULL ,"Assertion failed: %s, file: %s, line: %d" , +xfs_warn (mp,"Assertion failed: %s, file: %s, line: %d" , expr, file, line);WARN_ON (1 ); }void -assfail (char *expr,char *file,int line) +assfail ( +struct xfs_mount *mp, +char *expr, +char *file, +int line) { -xfs_emerg (NULL ,"Assertion failed: %s, file: %s, line: %d" , +xfs_emerg (mp,"Assertion failed: %s, file: %s, line: %d" , expr, file, line);if (xfs_globals.bug_on_assert)BUG ();
fs/xfs/xfs_message.h +2 -2
@@ -57,8 +57,8 @@ do { \#define xfs_debug_ratelimited (dev, fmt, ...) \ xfs_printk_ratelimited(xfs_debug, dev, fmt, ##__VA_ARGS__) -extern void assfail (char *expr,char *f,int l); -extern void asswarn (char *expr,char *f,int l); +void assfail (struct xfs_mount *mp,char *expr,char *f,int l); +void asswarn (struct xfs_mount *mp,char *expr,char *f,int l);extern void xfs_hex_dump (const void *p,int length);
Re: [PATCH v2 3/6] xfs: make the assertion message functions take a mount parameter
Looks good,
PATCH 4/6 xfs: add a XFS_CORRUPT_ON macro
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a new macro, XFS_CORRUPT_ON, which we will use to integrate some corruption reporting when the corruption test expression is true. This will be used in the next patch to remove the ugly XFS_WANT_CORRUPT* macros.
--- fs/xfs/xfs_linux.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/xfs/xfs_linux.h +12 -1
@@ -229,6 +229,10 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,#define ASSERT (expr) \ (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__)) +#define XFS_CORRUPT_ON (mp, expr) \ + (unlikely(expr) ? assfail((mp), #expr, __FILE__, __LINE__), \ + true : false) +#else /* !DEBUG */ #ifdef XFS_WARN
@@ -236,9 +240,16 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,#define ASSERT (expr) \ (likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__)) +#define XFS_CORRUPT_ON (mp, expr) \ + (unlikely(expr) ? asswarn((mp), #expr, __FILE__, __LINE__), \ + true : false) +#else /* !DEBUG && !XFS_WARN */ -#define ASSERT (expr) ((void)0) +#define ASSERT (expr) ((void)0) +#define XFS_CORRUPT_ON (mp, expr) \ + (unlikely(expr) ? XFS_ERROR_REPORT(#expr, XFS_ERRLEVEL_LOW, (mp)), \ + true : false)#endif /* XFS_WARN */ #endif /* DEBUG */
Re: [PATCH 4/6] xfs: add a XFS_CORRUPT_ON macro
Quoted 6 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Add a new macro,
XFS_CORRUPT_ON, which we will use to integrate some corruption reporting when the corruption test expression is true. This will be used in the next patch to remove the ugly XFS_WANT_CORRUPT* macros.
I don't particularly like the XFS_CORRUPT_ON name, and seeing how it is used I like it even less.
Maybe XFS_IS_CORRUPT instead?
Re: [PATCH 4/6] xfs: add a XFS_CORRUPT_ON macro
Quoted 8 lines · Christoph Hellwig
Quoted 6 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Add a new macro,
XFS_CORRUPT_ON, which we will use to integrate some corruption reporting when the corruption test expression is true. This will be used in the next patch to remove the ugly XFS_WANT_CORRUPT* macros.
Quoted 4 lines
I don't particularly like the
XFS_CORRUPT_ONname, and seeing how it is used I like it even less.Maybe
XFS_IS_CORRUPTinstead?
Fine with me.
I'd derived the name from WARN_ON, then realized that if you squint just right it becomes "XFS_CORRUPTION" and then wondered if I should just shorten it to "IS_BAD()" but sent it out anyway. :)
--D
PATCH v2 4/6 xfs: add a XFS_IS_CORRUPT macro
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a new macro, XFS_IS_CORRUPT, which we will use to integrate some corruption reporting when the corruption test expression is true. This will be used in the next patch to remove the ugly XFS_WANT_CORRUPT* macros.
---
v2: change name, start regenerating the rest of the patches...
--- fs/xfs/xfs_linux.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
fs/xfs/xfs_linux.h +12 -1
@@ -229,6 +229,10 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,#define ASSERT (expr) \ (likely(expr) ? (void)0 : assfail(NULL, #expr, __FILE__, __LINE__)) +#define XFS_IS_CORRUPT (mp, expr) \ + (unlikely(expr) ? assfail((mp), #expr, __FILE__, __LINE__), \ + true : false) +#else /* !DEBUG */ #ifdef XFS_WARN
@@ -236,9 +240,16 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count,#define ASSERT (expr) \ (likely(expr) ? (void)0 : asswarn(NULL, #expr, __FILE__, __LINE__)) +#define XFS_IS_CORRUPT (mp, expr) \ + (unlikely(expr) ? asswarn((mp), #expr, __FILE__, __LINE__), \ + true : false) +#else /* !DEBUG && !XFS_WARN */ -#define ASSERT (expr) ((void)0) +#define ASSERT (expr) ((void)0) +#define XFS_IS_CORRUPT (mp, expr) \ + (unlikely(expr) ? XFS_ERROR_REPORT(#expr, XFS_ERRLEVEL_LOW, (mp)), \ + true : false)#endif /* XFS_WARN */ #endif /* DEBUG */
PATCH 5/6 xfs: kill the XFS_WANT_CORRUPT_* macros
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
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_CORRUPT_ON 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_CORRUPT_ON(mp, !test)) { error = -EFSCORRUPTED; goto label; }
@@
expression mp, test;
@@
- XFS_WANT_CORRUPTED_RETURN(mp, test);
+ if (XFS_CORRUPT_ON(mp, !test)) return -EFSCORRUPTED;
@@
expression mp, lval, rval;
@@
- XFS_CORRUPT_ON(mp, !(lval == rval))
+ XFS_CORRUPT_ON(mp, lval != rval)
@@
expression mp, e1, e2;
@@
- XFS_CORRUPT_ON(mp, !(e1 && e2))
+ XFS_CORRUPT_ON(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_CORRUPT_ON(mp, !(e1 <= e2))
+ XFS_CORRUPT_ON(mp, e1 > e2)
@@
expression mp, e1, e2;
@@
- XFS_CORRUPT_ON(mp, !(e1 < e2))
+ XFS_CORRUPT_ON(mp, e1 >= e2)
@@
expression mp, e1;
@@
- XFS_CORRUPT_ON(mp, !!e1)
+ XFS_CORRUPT_ON(mp, e1)
@@
expression mp, e1, e2;
@@
- XFS_CORRUPT_ON(mp, !(e1 || e2))
+ XFS_CORRUPT_ON(mp, !e1 && !e2)
@@
expression mp, e1, e2, e3, e4;
@@
- XFS_CORRUPT_ON(mp, !(e1 == e2) && !(e3 == e4))
+ XFS_CORRUPT_ON(mp, e1 != e2 && e3 != e4)
@@
expression mp, e1, e2, e3, e4;
@@
- XFS_CORRUPT_ON(mp, !(e1 <= e2) || !(e3 >= e4))
+ XFS_CORRUPT_ON(mp, e1 > e2 || e3 < e4)
@@
expression mp, e1, e2, e3, e4;
@@
- XFS_CORRUPT_ON(mp, !(e1 == e2) && !(e3 <= e4))
+ XFS_CORRUPT_ON(mp, e1 != e2 && e3 > e4)
--- fs/xfs/libxfs/xfs_alloc.c | 229 +++++++++++++++++++------- fs/xfs/libxfs/xfs_bmap.c | 299 +++++++++++++++++++++++++++------- fs/xfs/libxfs/xfs_btree.c | 53 +++++- fs/xfs/libxfs/xfs_ialloc.c | 117 ++++++++++--- fs/xfs/libxfs/xfs_refcount.c | 167 ++++++++++++++----- fs/xfs/libxfs/xfs_rmap.c | 369 ++++++++++++++++++++++++++++++++---------- fs/xfs/xfs_discard.c | 5 - fs/xfs/xfs_error.h | 26 --- fs/xfs/xfs_iwalk.c | 3 9 files changed, 939 insertions(+), 329 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +167 -62
@@ -451,13 +451,15 @@ xfs_alloc_fixup_trees(#ifdef DEBUG if ((error =xfs_alloc_get_rec (cnt_cur, &nfbno1, &nflen1, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, - i ==1 && nfbno1 == fbno && nflen1 == flen); +if (XFS_CORRUPT_ON (mp, + i !=1 || nfbno1 != fbno || nflen1 != flen)) +return -EFSCORRUPTED ;#endif }else {if ((error =xfs_alloc_lookup_eq (cnt_cur, fbno, flen, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ; }/* * Look up the record in the by-block tree if necessary.
@@ -466,13 +468,15 @@ xfs_alloc_fixup_trees(#ifdef DEBUG if ((error =xfs_alloc_get_rec (bno_cur, &nfbno1, &nflen1, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, - i ==1 && nfbno1 == fbno && nflen1 == flen); +if (XFS_CORRUPT_ON (mp, + i !=1 || nfbno1 != fbno || nflen1 != flen)) +return -EFSCORRUPTED ;#endif }else {if ((error =xfs_alloc_lookup_eq (bno_cur, fbno, flen, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ; }#ifdef DEBUG
@@ -483,8 +487,9 @@ xfs_alloc_fixup_trees( bnoblock =XFS_BUF_TO_BLOCK (bno_cur->bc_bufs[0 ]); cntblock =XFS_BUF_TO_BLOCK (cnt_cur->bc_bufs[0 ]); -XFS_WANT_CORRUPTED_RETURN (mp, - bnoblock->bb_numrecs == cntblock->bb_numrecs); +if (XFS_CORRUPT_ON (mp, + bnoblock->bb_numrecs != cntblock->bb_numrecs)) + return -EFSCORRUPTED; }#endif
@@ -514,25 +519,30 @@ xfs_alloc_fixup_trees(*/ if ((error =xfs_btree_delete (cnt_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ;/* * Add new by-size btree entry(s). */ if (nfbno1 !=NULLAGBLOCK ) {if ((error =xfs_alloc_lookup_eq (cnt_cur, nfbno1, nflen1, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==0 ); +if (XFS_CORRUPT_ON (mp, i !=0 )) +return -EFSCORRUPTED ;if ((error =xfs_btree_insert (cnt_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ; }if (nfbno2 !=NULLAGBLOCK ) {if ((error =xfs_alloc_lookup_eq (cnt_cur, nfbno2, nflen2, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==0 ); +if (XFS_CORRUPT_ON (mp, i !=0 )) +return -EFSCORRUPTED ;if ((error =xfs_btree_insert (cnt_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ; }/* * Fix up the by-block btree entry(s).
@@ -543,7 +553,8 @@ xfs_alloc_fixup_trees(*/ if ((error =xfs_btree_delete (bno_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ; }else {/* * Update the by-block entry to start later|be shorter.
@@ -557,10 +568,12 @@ xfs_alloc_fixup_trees(*/ if ((error =xfs_alloc_lookup_eq (bno_cur, nfbno2, nflen2, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==0 ); +if (XFS_CORRUPT_ON (mp, i !=0 )) +return -EFSCORRUPTED ;if ((error =xfs_btree_insert (bno_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_CORRUPT_ON (mp, i !=1 )) +return -EFSCORRUPTED ; }return 0 ; }
@@ -821,7 +834,8 @@ xfs_alloc_cur_check( error =xfs_alloc_get_rec (cur, &bno, &len, &i);if (error)return error; -XFS_WANT_CORRUPTED_RETURN (args->mp, i ==1 ); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) +return -EFSCORRUPTED ;/* * Check minlen and deactivate a cntbt cursor if out of acceptable size
@@ -1026,7 +1040,10 @@ xfs_alloc_ag_vextent_small( error =xfs_alloc_get_rec (ccur, &fbno, &flen, &i);if (error) goto error; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error; + } goto out; }
@@ -1058,9 +1075,11 @@ xfs_alloc_ag_vextent_small( } *fbnop = args->agbno = fbno; *flenp = args->len =1 ; -XFS_WANT_CORRUPTED_GOTO (args->mp, - fbno <be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length), - error); +if (XFS_CORRUPT_ON (args->mp, + fbno >=be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length))) { + error = -EFSCORRUPTED ; + goto error; + } args->wasfromfl =1 ;trace_xfs_alloc_small_freelist (args);
@@ -1215,7 +1234,10 @@ xfs_alloc_ag_vextent_exact( error =xfs_alloc_get_rec (bno_cur, &fbno, &flen, &i);if (error) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }ASSERT (fbno <= args->agbno);/*
@@ -1550,7 +1572,10 @@ xfs_alloc_ag_vextent_near( &i);if (error) goto out; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , out); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto out; + }if (len >= args->minlen)break ; error =xfs_btree_increment (acur.cnt,0 , &i);
@@ -1675,7 +1700,10 @@ xfs_alloc_ag_vextent_size( error =xfs_alloc_get_rec (cnt_cur, &fbno, &flen, &i);if (error) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } busy =xfs_alloc_compute_aligned (args, fbno, flen, &rbno, &rlen, &busy_gen);
@@ -1709,8 +1737,11 @@ xfs_alloc_ag_vextent_size(* This can't happen in the second case above. */ rlen =XFS_EXTLEN_MIN (args->maxlen, rlen); -XFS_WANT_CORRUPTED_GOTO (args->mp, rlen ==0 || - (rlen <= flen && rbno + rlen <= fbno + flen), error0); +if (XFS_CORRUPT_ON (args->mp, + rlen !=0 && (rlen > flen || rbno + rlen > fbno + flen))) { + error = -EFSCORRUPTED ; + goto error0; + }if (rlen < args->maxlen) {xfs_agblock_t bestfbno;xfs_extlen_t bestflen;
@@ -1729,15 +1760,21 @@ xfs_alloc_ag_vextent_size(if ((error =xfs_alloc_get_rec (cnt_cur, &fbno, &flen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if (flen < bestrlen)break ; busy =xfs_alloc_compute_aligned (args, fbno, flen, &rbno, &rlen, &busy_gen); rlen =XFS_EXTLEN_MIN (args->maxlen, rlen); -XFS_WANT_CORRUPTED_GOTO (args->mp, rlen ==0 || - (rlen <= flen && rbno + rlen <= fbno + flen), - error0); +if (XFS_CORRUPT_ON (args->mp, + rlen !=0 && + (rlen > flen || rbno + rlen > fbno + flen))) { + error = -EFSCORRUPTED ; + goto error0; + }if (rlen > bestrlen) { bestrlen = rlen; bestrbno = rbno;
@@ -1750,7 +1787,10 @@ xfs_alloc_ag_vextent_size(if ((error =xfs_alloc_lookup_eq (cnt_cur, bestfbno, bestflen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_CORRUPT_ON (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } rlen = bestrlen; rbno = bestrbno; flen = bestflen;
@@ -1773,7 +1813,10 @@ xfs_alloc_ag_vextent_size(xfs_alloc_fix_len (args); rlen = args->len; -XFS_WANT_CORRUPTED_GOTO (args->mp, rlen <= flen, error0); +if (XFS_CORRUPT_ON (args->mp, rlen > flen)) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Allocate and initialize a cursor for the by-block tree. */
@@ -1787,10 +1830,12 @@ xfs_alloc_ag_vextent_size( cnt_cur = bno_cur =NULL ; args->len = rlen; args->agbno = rbno; -XFS_WANT_CORRUPTED_GOTO (args->mp, - args->agbno + args->len <= -be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length), - error0); +if (XFS_CORRUPT_ON (args->mp, + args->agbno + args->len > +be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length))) { + error = -EFSCORRUPTED ; + goto error0; + }trace_xfs_alloc_size_done (args);return 0 ;
@@ -1862,7 +1907,10 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_get_rec (bno_cur, <bno, <len, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * It's not contiguous, though. */
@@ -1874,8 +1922,10 @@ xfs_free_ag_extent(* space was invalid, it's (partly) already free. * Very bad. */ -XFS_WANT_CORRUPTED_GOTO (mp, - ltbno + ltlen <= bno, error0); +if (XFS_CORRUPT_ON (mp, ltbno + ltlen > bno)) { + error = -EFSCORRUPTED ; + goto error0; + } } }/*
@@ -1890,7 +1940,10 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_get_rec (bno_cur, >bno, >len, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * It's not contiguous, though. */
@@ -1902,7 +1955,10 @@ xfs_free_ag_extent(* space was invalid, it's (partly) already free. * Very bad. */ -XFS_WANT_CORRUPTED_GOTO (mp, gtbno >= bno + len, error0); +if (XFS_CORRUPT_ON (mp, bno + len > gtbno)) { + error = -EFSCORRUPTED ; + goto error0; + } } }/*
@@ -1919,31 +1975,49 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, ltbno, ltlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Delete the old by-size entry on the right. */ if ((error =xfs_alloc_lookup_eq (cnt_cur, gtbno, gtlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Delete the old by-block entry for the right block. */ if ((error =xfs_btree_delete (bno_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Move the by-block cursor back to the left neighbor. */ if ((error =xfs_btree_decrement (bno_cur,0 , &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }#ifdef DEBUG /* * Check that this is the right record: delete didn't
@@ -1956,9 +2030,11 @@ xfs_free_ag_extent(if ((error =xfs_alloc_get_rec (bno_cur, &xxbno, &xxlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, - i ==1 && xxbno == ltbno && xxlen == ltlen, - error0); +if (XFS_CORRUPT_ON (mp, + i !=1 || xxbno != ltbno || xxlen != ltlen)) { + error = -EFSCORRUPTED ; + goto error0; + } }#endif /*
@@ -1979,17 +2055,26 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, ltbno, ltlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Back up the by-block cursor to the left neighbor, and * update its length. */ if ((error =xfs_btree_decrement (bno_cur,0 , &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } nbno = ltbno; nlen = len + ltlen;if ((error =xfs_alloc_update (bno_cur, nbno, nlen)))
@@ -2005,10 +2090,16 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, gtbno, gtlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Update the starting block and length of the right * neighbor in the by-block tree.
@@ -2027,7 +2118,10 @@ xfs_free_ag_extent( nlen = len;if ((error =xfs_btree_insert (bno_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } }xfs_btree_del_cursor (bno_cur,XFS_BTREE_NOERROR ); bno_cur =NULL ;
@@ -2036,10 +2130,16 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, nbno, nlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==0 , error0); +if (XFS_CORRUPT_ON (mp, i !=0 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_insert (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }xfs_btree_del_cursor (cnt_cur,XFS_BTREE_NOERROR ); cnt_cur =NULL ;
@@ -3164,12 +3264,17 @@ __xfs_free_extent(if (error)return error; -XFS_WANT_CORRUPTED_GOTO (mp, agbno < mp->m_sb.sb_agblocks, err); +if (XFS_CORRUPT_ON (mp, agbno >= mp->m_sb.sb_agblocks)) { + error = -EFSCORRUPTED ; + goto err; + }/* validate the extent size is legal now we have the agf locked */ -XFS_WANT_CORRUPTED_GOTO (mp, - agbno + len <=be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_length), - err); +if (XFS_CORRUPT_ON (mp, + agbno + len >be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_length))) { + error = -EFSCORRUPTED ; + goto err; + } error =xfs_free_ag_extent (tp, agbp, agno, agbno, len, oinfo, type);if (error)
fs/xfs/libxfs/xfs_bmap.c +234 -65
593 lines not on this page · raw message
fs/xfs/libxfs/xfs_btree.c +42 -11
110 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc.c +86 -31
246 lines not on this page · raw message
fs/xfs/libxfs/xfs_refcount.c +122 -45
321 lines not on this page · raw message
fs/xfs/libxfs/xfs_rmap.c +282 -87
692 lines not on this page · raw message
fs/xfs/xfs_discard.c +4 -1
@@ -70,7 +70,10 @@ xfs_trim_extents( error =xfs_alloc_get_rec (cur, &fbno, &flen, &i);if (error) goto out_del_cursor; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , out_del_cursor); +if (XFS_CORRUPT_ON (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto out_del_cursor; + }ASSERT (flen <=be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_longest));/*
fs/xfs/xfs_error.h +0 -26
@@ -38,32 +38,6 @@ extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error,/* Dump 128 bytes of any corrupt buffer */ #define XFS_CORRUPTION_DUMP_LEN (128) -/* -* Macros to set EFSCORRUPTED & return/branch. -*/ -#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, mp); \ - error = -EFSCORRUPTED; \ - goto l; \ - } \ - } - -#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, mp); \ - return -EFSCORRUPTED; \ - } \ - } -#ifdef DEBUG extern int xfs_errortag_init (struct xfs_mount *mp);extern void xfs_errortag_del (struct xfs_mount *mp);
fs/xfs/xfs_iwalk.c +2 -1
@@ -298,7 +298,8 @@ xfs_iwalk_ag_start( error =xfs_inobt_get_rec (*curpp, irec, has_more);if (error)return error; -XFS_WANT_CORRUPTED_RETURN (mp, *has_more ==1 ); +if (XFS_CORRUPT_ON (mp, *has_more !=1 )) +return -EFSCORRUPTED ;/* * If the LE lookup yielded an inobt record before the cursor position,
PATCH v2 5/6 xfs: kill the XFS_WANT_CORRUPT_* macros
From: Darrick J. Wong <[email protected]>
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)
--- fs/xfs/libxfs/xfs_alloc.c | 229 +++++++++++++++++++------- fs/xfs/libxfs/xfs_bmap.c | 299 +++++++++++++++++++++++++++------- fs/xfs/libxfs/xfs_btree.c | 53 +++++- fs/xfs/libxfs/xfs_ialloc.c | 117 ++++++++++--- fs/xfs/libxfs/xfs_refcount.c | 167 ++++++++++++++----- fs/xfs/libxfs/xfs_rmap.c | 369 ++++++++++++++++++++++++++++++++---------- fs/xfs/xfs_discard.c | 5 - fs/xfs/xfs_error.h | 26 --- fs/xfs/xfs_iwalk.c | 3 9 files changed, 939 insertions(+), 329 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +167 -62
@@ -451,13 +451,15 @@ xfs_alloc_fixup_trees(#ifdef DEBUG if ((error =xfs_alloc_get_rec (cnt_cur, &nfbno1, &nflen1, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, - i ==1 && nfbno1 == fbno && nflen1 == flen); +if (XFS_IS_CORRUPT (mp, + i !=1 || nfbno1 != fbno || nflen1 != flen)) +return -EFSCORRUPTED ;#endif }else {if ((error =xfs_alloc_lookup_eq (cnt_cur, fbno, flen, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ; }/* * Look up the record in the by-block tree if necessary.
@@ -466,13 +468,15 @@ xfs_alloc_fixup_trees(#ifdef DEBUG if ((error =xfs_alloc_get_rec (bno_cur, &nfbno1, &nflen1, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, - i ==1 && nfbno1 == fbno && nflen1 == flen); +if (XFS_IS_CORRUPT (mp, + i !=1 || nfbno1 != fbno || nflen1 != flen)) +return -EFSCORRUPTED ;#endif }else {if ((error =xfs_alloc_lookup_eq (bno_cur, fbno, flen, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ; }#ifdef DEBUG
@@ -483,8 +487,9 @@ xfs_alloc_fixup_trees( bnoblock =XFS_BUF_TO_BLOCK (bno_cur->bc_bufs[0 ]); cntblock =XFS_BUF_TO_BLOCK (cnt_cur->bc_bufs[0 ]); -XFS_WANT_CORRUPTED_RETURN (mp, - bnoblock->bb_numrecs == cntblock->bb_numrecs); +if (XFS_IS_CORRUPT (mp, + bnoblock->bb_numrecs != cntblock->bb_numrecs)) + return -EFSCORRUPTED; }#endif
@@ -514,25 +519,30 @@ xfs_alloc_fixup_trees(*/ if ((error =xfs_btree_delete (cnt_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ;/* * Add new by-size btree entry(s). */ if (nfbno1 !=NULLAGBLOCK ) {if ((error =xfs_alloc_lookup_eq (cnt_cur, nfbno1, nflen1, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==0 ); +if (XFS_IS_CORRUPT (mp, i !=0 )) +return -EFSCORRUPTED ;if ((error =xfs_btree_insert (cnt_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ; }if (nfbno2 !=NULLAGBLOCK ) {if ((error =xfs_alloc_lookup_eq (cnt_cur, nfbno2, nflen2, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==0 ); +if (XFS_IS_CORRUPT (mp, i !=0 )) +return -EFSCORRUPTED ;if ((error =xfs_btree_insert (cnt_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ; }/* * Fix up the by-block btree entry(s).
@@ -543,7 +553,8 @@ xfs_alloc_fixup_trees(*/ if ((error =xfs_btree_delete (bno_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ; }else {/* * Update the by-block entry to start later|be shorter.
@@ -557,10 +568,12 @@ xfs_alloc_fixup_trees(*/ if ((error =xfs_alloc_lookup_eq (bno_cur, nfbno2, nflen2, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==0 ); +if (XFS_IS_CORRUPT (mp, i !=0 )) +return -EFSCORRUPTED ;if ((error =xfs_btree_insert (bno_cur, &i)))return error; -XFS_WANT_CORRUPTED_RETURN (mp, i ==1 ); +if (XFS_IS_CORRUPT (mp, i !=1 )) +return -EFSCORRUPTED ; }return 0 ; }
@@ -821,7 +834,8 @@ xfs_alloc_cur_check( error =xfs_alloc_get_rec (cur, &bno, &len, &i);if (error)return error; -XFS_WANT_CORRUPTED_RETURN (args->mp, i ==1 ); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) +return -EFSCORRUPTED ;/* * Check minlen and deactivate a cntbt cursor if out of acceptable size
@@ -1026,7 +1040,10 @@ xfs_alloc_ag_vextent_small( error =xfs_alloc_get_rec (ccur, &fbno, &flen, &i);if (error) goto error; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error; + } goto out; }
@@ -1058,9 +1075,11 @@ xfs_alloc_ag_vextent_small( } *fbnop = args->agbno = fbno; *flenp = args->len =1 ; -XFS_WANT_CORRUPTED_GOTO (args->mp, - fbno <be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length), - error); +if (XFS_IS_CORRUPT (args->mp, + fbno >=be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length))) { + error = -EFSCORRUPTED ; + goto error; + } args->wasfromfl =1 ;trace_xfs_alloc_small_freelist (args);
@@ -1215,7 +1234,10 @@ xfs_alloc_ag_vextent_exact( error =xfs_alloc_get_rec (bno_cur, &fbno, &flen, &i);if (error) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }ASSERT (fbno <= args->agbno);/*
@@ -1550,7 +1572,10 @@ xfs_alloc_ag_vextent_near( &i);if (error) goto out; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , out); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto out; + }if (len >= args->minlen)break ; error =xfs_btree_increment (acur.cnt,0 , &i);
@@ -1675,7 +1700,10 @@ xfs_alloc_ag_vextent_size( error =xfs_alloc_get_rec (cnt_cur, &fbno, &flen, &i);if (error) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } busy =xfs_alloc_compute_aligned (args, fbno, flen, &rbno, &rlen, &busy_gen);
@@ -1709,8 +1737,11 @@ xfs_alloc_ag_vextent_size(* This can't happen in the second case above. */ rlen =XFS_EXTLEN_MIN (args->maxlen, rlen); -XFS_WANT_CORRUPTED_GOTO (args->mp, rlen ==0 || - (rlen <= flen && rbno + rlen <= fbno + flen), error0); +if (XFS_IS_CORRUPT (args->mp, + rlen !=0 && (rlen > flen || rbno + rlen > fbno + flen))) { + error = -EFSCORRUPTED ; + goto error0; + }if (rlen < args->maxlen) {xfs_agblock_t bestfbno;xfs_extlen_t bestflen;
@@ -1729,15 +1760,21 @@ xfs_alloc_ag_vextent_size(if ((error =xfs_alloc_get_rec (cnt_cur, &fbno, &flen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if (flen < bestrlen)break ; busy =xfs_alloc_compute_aligned (args, fbno, flen, &rbno, &rlen, &busy_gen); rlen =XFS_EXTLEN_MIN (args->maxlen, rlen); -XFS_WANT_CORRUPTED_GOTO (args->mp, rlen ==0 || - (rlen <= flen && rbno + rlen <= fbno + flen), - error0); +if (XFS_IS_CORRUPT (args->mp, + rlen !=0 && + (rlen > flen || rbno + rlen > fbno + flen))) { + error = -EFSCORRUPTED ; + goto error0; + }if (rlen > bestrlen) { bestrlen = rlen; bestrbno = rbno;
@@ -1750,7 +1787,10 @@ xfs_alloc_ag_vextent_size(if ((error =xfs_alloc_lookup_eq (cnt_cur, bestfbno, bestflen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (args->mp, i ==1 , error0); +if (XFS_IS_CORRUPT (args->mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } rlen = bestrlen; rbno = bestrbno; flen = bestflen;
@@ -1773,7 +1813,10 @@ xfs_alloc_ag_vextent_size(xfs_alloc_fix_len (args); rlen = args->len; -XFS_WANT_CORRUPTED_GOTO (args->mp, rlen <= flen, error0); +if (XFS_IS_CORRUPT (args->mp, rlen > flen)) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Allocate and initialize a cursor for the by-block tree. */
@@ -1787,10 +1830,12 @@ xfs_alloc_ag_vextent_size( cnt_cur = bno_cur =NULL ; args->len = rlen; args->agbno = rbno; -XFS_WANT_CORRUPTED_GOTO (args->mp, - args->agbno + args->len <= -be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length), - error0); +if (XFS_IS_CORRUPT (args->mp, + args->agbno + args->len > +be32_to_cpu (XFS_BUF_TO_AGF (args->agbp)->agf_length))) { + error = -EFSCORRUPTED ; + goto error0; + }trace_xfs_alloc_size_done (args);return 0 ;
@@ -1862,7 +1907,10 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_get_rec (bno_cur, <bno, <len, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * It's not contiguous, though. */
@@ -1874,8 +1922,10 @@ xfs_free_ag_extent(* space was invalid, it's (partly) already free. * Very bad. */ -XFS_WANT_CORRUPTED_GOTO (mp, - ltbno + ltlen <= bno, error0); +if (XFS_IS_CORRUPT (mp, ltbno + ltlen > bno)) { + error = -EFSCORRUPTED ; + goto error0; + } } }/*
@@ -1890,7 +1940,10 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_get_rec (bno_cur, >bno, >len, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * It's not contiguous, though. */
@@ -1902,7 +1955,10 @@ xfs_free_ag_extent(* space was invalid, it's (partly) already free. * Very bad. */ -XFS_WANT_CORRUPTED_GOTO (mp, gtbno >= bno + len, error0); +if (XFS_IS_CORRUPT (mp, bno + len > gtbno)) { + error = -EFSCORRUPTED ; + goto error0; + } } }/*
@@ -1919,31 +1975,49 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, ltbno, ltlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Delete the old by-size entry on the right. */ if ((error =xfs_alloc_lookup_eq (cnt_cur, gtbno, gtlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Delete the old by-block entry for the right block. */ if ((error =xfs_btree_delete (bno_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Move the by-block cursor back to the left neighbor. */ if ((error =xfs_btree_decrement (bno_cur,0 , &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }#ifdef DEBUG /* * Check that this is the right record: delete didn't
@@ -1956,9 +2030,11 @@ xfs_free_ag_extent(if ((error =xfs_alloc_get_rec (bno_cur, &xxbno, &xxlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, - i ==1 && xxbno == ltbno && xxlen == ltlen, - error0); +if (XFS_IS_CORRUPT (mp, + i !=1 || xxbno != ltbno || xxlen != ltlen)) { + error = -EFSCORRUPTED ; + goto error0; + } }#endif /*
@@ -1979,17 +2055,26 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, ltbno, ltlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Back up the by-block cursor to the left neighbor, and * update its length. */ if ((error =xfs_btree_decrement (bno_cur,0 , &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } nbno = ltbno; nlen = len + ltlen;if ((error =xfs_alloc_update (bno_cur, nbno, nlen)))
@@ -2005,10 +2090,16 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, gtbno, gtlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_delete (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }/* * Update the starting block and length of the right * neighbor in the by-block tree.
@@ -2027,7 +2118,10 @@ xfs_free_ag_extent( nlen = len;if ((error =xfs_btree_insert (bno_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + } }xfs_btree_del_cursor (bno_cur,XFS_BTREE_NOERROR ); bno_cur =NULL ;
@@ -2036,10 +2130,16 @@ xfs_free_ag_extent(*/ if ((error =xfs_alloc_lookup_eq (cnt_cur, nbno, nlen, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==0 , error0); +if (XFS_IS_CORRUPT (mp, i !=0 )) { + error = -EFSCORRUPTED ; + goto error0; + }if ((error =xfs_btree_insert (cnt_cur, &i))) goto error0; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , error0); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto error0; + }xfs_btree_del_cursor (cnt_cur,XFS_BTREE_NOERROR ); cnt_cur =NULL ;
@@ -3164,12 +3264,17 @@ __xfs_free_extent(if (error)return error; -XFS_WANT_CORRUPTED_GOTO (mp, agbno < mp->m_sb.sb_agblocks, err); +if (XFS_IS_CORRUPT (mp, agbno >= mp->m_sb.sb_agblocks)) { + error = -EFSCORRUPTED ; + goto err; + }/* validate the extent size is legal now we have the agf locked */ -XFS_WANT_CORRUPTED_GOTO (mp, - agbno + len <=be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_length), - err); +if (XFS_IS_CORRUPT (mp, + agbno + len >be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_length))) { + error = -EFSCORRUPTED ; + goto err; + } error =xfs_free_ag_extent (tp, agbp, agno, agbno, len, oinfo, type);if (error)
fs/xfs/libxfs/xfs_bmap.c +234 -65
593 lines not on this page · raw message
fs/xfs/libxfs/xfs_btree.c +42 -11
110 lines not on this page · raw message
fs/xfs/libxfs/xfs_ialloc.c +86 -31
246 lines not on this page · raw message
fs/xfs/libxfs/xfs_refcount.c +122 -45
321 lines not on this page · raw message
fs/xfs/libxfs/xfs_rmap.c +282 -87
692 lines not on this page · raw message
fs/xfs/xfs_discard.c +4 -1
@@ -70,7 +70,10 @@ xfs_trim_extents( error =xfs_alloc_get_rec (cur, &fbno, &flen, &i);if (error) goto out_del_cursor; -XFS_WANT_CORRUPTED_GOTO (mp, i ==1 , out_del_cursor); +if (XFS_IS_CORRUPT (mp, i !=1 )) { + error = -EFSCORRUPTED ; + goto out_del_cursor; + }ASSERT (flen <=be32_to_cpu (XFS_BUF_TO_AGF (agbp)->agf_longest));/*
fs/xfs/xfs_error.h +0 -26
@@ -38,32 +38,6 @@ extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error,/* Dump 128 bytes of any corrupt buffer */ #define XFS_CORRUPTION_DUMP_LEN (128) -/* -* Macros to set EFSCORRUPTED & return/branch. -*/ -#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, mp); \ - error = -EFSCORRUPTED; \ - goto l; \ - } \ - } - -#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, mp); \ - return -EFSCORRUPTED; \ - } \ - } -#ifdef DEBUG extern int xfs_errortag_init (struct xfs_mount *mp);extern void xfs_errortag_del (struct xfs_mount *mp);
fs/xfs/xfs_iwalk.c +2 -1
@@ -298,7 +298,8 @@ xfs_iwalk_ag_start( error =xfs_inobt_get_rec (*curpp, irec, has_more);if (error)return error; -XFS_WANT_CORRUPTED_RETURN (mp, *has_more ==1 ); +if (XFS_IS_CORRUPT (mp, *has_more !=1 )) +return -EFSCORRUPTED ;/* * If the LE lookup yielded an inobt record before the cursor position,
PATCH 6/6 xfs: convert open coded corruption check to use XFS_CORRUPT_ON
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Convert the last of the open coded corruption check and report idioms to use the XFS_CORRUPT_ON macro. In a subsequent patch we are going to add health reporting to the code block under each corruption check, so we don't bother to clean out "{ return -EFSCORRUPTED; }".
--- fs/xfs/libxfs/xfs_alloc.c | 6 +-- fs/xfs/libxfs/xfs_bmap.c | 75 +++++++++++++--------------------------- fs/xfs/libxfs/xfs_btree.c | 13 +++---- fs/xfs/libxfs/xfs_da_btree.c | 58 ++++++++++++------------------- fs/xfs/libxfs/xfs_dir2.c | 8 ++-- fs/xfs/libxfs/xfs_dir2_node.c | 9 ++--- fs/xfs/libxfs/xfs_inode_fork.h | 4 ++ fs/xfs/libxfs/xfs_refcount.c | 7 ++-- fs/xfs/libxfs/xfs_rmap.c | 3 +- fs/xfs/libxfs/xfs_rtbitmap.c | 3 +- fs/xfs/xfs_attr_list.c | 20 ++++------- fs/xfs/xfs_dir2_readdir.c | 16 +++------ fs/xfs/xfs_iomap.c | 7 +--- fs/xfs/xfs_iops.c | 3 +- fs/xfs/xfs_log_recover.c | 66 ++++++++++++----------------------- fs/xfs/xfs_mount.c | 7 +--- fs/xfs/xfs_qm.c | 10 ++--- 17 files changed, 116 insertions(+), 199 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +2 -4
@@ -1066,8 +1066,7 @@ xfs_alloc_ag_vextent_small(struct xfs_buf *bp; bp =xfs_btree_get_bufs (args->mp, args->tp, args->agno, fbno); -if (!bp) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , args->mp); +if (XFS_CORRUPT_ON (args->mp, !bp)) { error = -EFSCORRUPTED ; goto error; }
@@ -2318,8 +2317,7 @@ xfs_free_agfl_block(return error; bp =xfs_btree_get_bufs (tp->t_mountp, tp, agno, agbno); -if (!bp) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , tp->t_mountp); +if (XFS_CORRUPT_ON (tp->t_mountp, !bp)) {return -EFSCORRUPTED ; }xfs_trans_binval (tp, bp);
fs/xfs/libxfs/xfs_bmap.c +24 -51
161 lines not on this page · raw message
fs/xfs/libxfs/xfs_btree.c +5 -8
@@ -105,11 +105,10 @@ xfs_btree_check_lblock(xfs_failaddr_t fa; fa =__xfs_btree_check_lblock (cur, block, level, bp); -if (unlikely (XFS_TEST_ERROR (fa !=NULL , mp, -XFS_ERRTAG_BTREE_CHECK_LBLOCK ))) { +if (XFS_CORRUPT_ON (mp, fa !=NULL ) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BTREE_CHECK_LBLOCK )) {if (bp)trace_xfs_btree_corrupt (bp, _RET_IP_); -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }return 0 ;
@@ -169,11 +168,10 @@ xfs_btree_check_sblock(xfs_failaddr_t fa; fa =__xfs_btree_check_sblock (cur, block, level, bp); -if (unlikely (XFS_TEST_ERROR (fa !=NULL , mp, -XFS_ERRTAG_BTREE_CHECK_SBLOCK ))) { +if (XFS_CORRUPT_ON (mp, fa !=NULL ) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BTREE_CHECK_SBLOCK )) {if (bp)trace_xfs_btree_corrupt (bp, _RET_IP_); -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }return 0 ;
@@ -1868,8 +1866,7 @@ xfs_btree_lookup(XFS_BTREE_STATS_INC (cur, lookup);/* No such thing as a zero-level tree. */ -if (cur->bc_nlevels ==0 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , cur->bc_mp); +if (XFS_CORRUPT_ON (cur->bc_mp, cur->bc_nlevels ==0 )) {return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_da_btree.c +22 -36
131 lines not on this page · raw message
fs/xfs/libxfs/xfs_dir2.c +4 -4
@@ -191,10 +191,10 @@ xfs_dir_ino_validate( {bool ino_ok =xfs_verify_dir_ino (mp, ino); -if (unlikely (XFS_TEST_ERROR (!ino_ok, mp,XFS_ERRTAG_DIR_INO_VALIDATE ))) { +if (XFS_CORRUPT_ON (mp, !ino_ok) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_DIR_INO_VALIDATE )) {xfs_warn (mp,"Invalid inode number 0x%Lx" , (unsigned long long ) ino); -XFS_ERROR_REPORT ("xfs_dir_ino_validate" ,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }return 0 ;
@@ -600,8 +600,8 @@ xfs_dir2_isblock(if ((rval =xfs_bmap_last_offset (args->dp, &last,XFS_DATA_FORK )))return rval; rval =XFS_FSB_TO_B (args->dp->i_mount, last) == args->geo->blksize; -if (rval !=0 && args->dp->i_d.di_size != args->geo->blksize) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , args->dp->i_mount); +if (XFS_CORRUPT_ON (args->dp->i_mount, + rval !=0 && args->dp->i_d.di_size != args->geo->blksize)) {return -EFSCORRUPTED ; } *vp = rval;
fs/xfs/libxfs/xfs_dir2_node.c +4 -5
@@ -670,9 +670,8 @@ xfs_dir2_leafn_lookup_for_addname(* If it has room, return it. */ bests = dp->d_ops->free_bests_p (free); -if (unlikely (bests[fi] ==cpu_to_be16 (NULLDATAOFF ))) { -XFS_ERROR_REPORT ("xfs_dir2_leafn_lookup_int" , -XFS_ERRLEVEL_LOW , mp); +if (XFS_CORRUPT_ON (mp, + bests[fi] ==cpu_to_be16 (NULLDATAOFF ))) {if (curfdb != newfdb)xfs_trans_brelse (tp, curbp);return -EFSCORRUPTED ;
@@ -1671,7 +1670,8 @@ xfs_dir2_node_add_datablk(if (error)return error; -if (dp->d_ops->db_to_fdb (args->geo, *dbno) != fbno) { +if (XFS_CORRUPT_ON (mp, + dp->d_ops->db_to_fdb (args->geo, *dbno) != fbno)) { xfs_alert(mp, "%s: dir ino %llu needed freesp block %lld for data block %lld, got %lld", __func__, (unsigned long long)dp->i_ino,
@@ -1685,7 +1685,6 @@ xfs_dir2_node_add_datablk( }else {xfs_alert (mp," ... fblk is NULL" ); } -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_inode_fork.h +4 -0
@@ -87,6 +87,10 @@ struct xfs_ifork {#define XFS_IFORK_MAXEXT (ip, w) \ (XFS_IFORK_SIZE(ip, w) / sizeof(xfs_bmbt_rec_t)) +#define XFS_IFORK_MAPS_BLOCKS (ip, w) \ + (XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_EXTENTS || \ + XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_BTREE) +struct xfs_ifork *xfs_iext_state_to_fork (struct xfs_inode *ip,int state);int xfs_iformat_fork (struct xfs_inode *,struct xfs_dinode *);
fs/xfs/libxfs/xfs_refcount.c +4 -3
@@ -1177,8 +1177,9 @@ xfs_refcount_finish_one( XFS_ALLOC_FLAG_FREEING, &agbp);if (error)return error; -if (!agbp) +if (XFS_CORRUPT_ON (tp->t_mountp, !agbp)) {return -EFSCORRUPTED ; + } rcur =xfs_refcountbt_init_cursor (mp, tp, agbp, agno);if (!rcur) {
@@ -1668,8 +1669,8 @@ xfs_refcount_recover_extent(struct list_head *debris = priv;struct xfs_refcount_recovery *rr; -if (be32_to_cpu (rec->refc.rc_refcount) !=1 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , cur->bc_mp); +if (XFS_CORRUPT_ON (cur->bc_mp, +be32_to_cpu (rec->refc.rc_refcount) !=1 )) {return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_rmap.c +2 -1
@@ -2394,8 +2394,9 @@ xfs_rmap_finish_one( error =xfs_free_extent_fix_freelist (tp, agno, &agbp);if (error)return error; -if (!agbp) +if (XFS_CORRUPT_ON (tp->t_mountp, !agbp)) {return -EFSCORRUPTED ; + } rcur =xfs_rmapbt_init_cursor (mp, tp, agbp, agno);if (!rcur) {
fs/xfs/libxfs/xfs_rtbitmap.c +1 -2
@@ -70,8 +70,7 @@ xfs_rtbuf_get(if (error)return error; -if (nmap ==0 || !xfs_bmap_is_real_extent (&map)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp); +if (XFS_CORRUPT_ON (mp, nmap ==0 || !xfs_bmap_is_real_extent (&map))) {return -EFSCORRUPTED ; }
fs/xfs/xfs_attr_list.c +7 -13
@@ -86,11 +86,9 @@ xfs_attr_shortform_list( (XFS_ISRESET_CURSOR(cursor) && (dp->i_afp->if_bytes + sf->hdr.count * 16) < context->bufsize)) {for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) { -if (!xfs_attr_namecheck (sfe->nameval, sfe->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - context->dp->i_mount); +if (XFS_CORRUPT_ON (context->dp->i_mount, + !xfs_attr_namecheck (sfe->nameval, sfe->namelen)))return -EFSCORRUPTED ; - } context->put_listent(context, sfe->flags, sfe->nameval,
@@ -179,9 +177,8 @@ xfs_attr_shortform_list( cursor->hashval = sbp->hash; cursor->offset =0 ; } -if (!xfs_attr_namecheck (sbp->name, sbp->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - context->dp->i_mount); +if (XFS_CORRUPT_ON (context->dp->i_mount, + !xfs_attr_namecheck (sbp->name, sbp->namelen))) { error = -EFSCORRUPTED ; goto out; }
@@ -269,8 +266,7 @@ xfs_attr_node_list_lookup(return 0 ;/* We can't point back to the root. */ -if (cursor->blkno ==0 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp); +if (XFS_CORRUPT_ON (mp, cursor->blkno ==0 )) {return -EFSCORRUPTED ; } }
@@ -473,11 +469,9 @@ xfs_attr3_leaf_list_int( valuelen =be32_to_cpu (name_rmt->valuelen); } -if (!xfs_attr_namecheck (name, namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - context->dp->i_mount); +if (XFS_CORRUPT_ON (context->dp->i_mount, + !xfs_attr_namecheck (name, namelen)))return -EFSCORRUPTED ; - } context->put_listent (context, entry->flags, name, namelen, valuelen);if (context->seen_enough)
fs/xfs/xfs_dir2_readdir.c +6 -10
@@ -116,11 +116,9 @@ xfs_dir2_sf_getdents( ino = dp->d_ops->sf_get_ino (sfp, sfep); filetype = dp->d_ops->sf_get_ftype (sfep); ctx->pos = off &0x7fffffff ; -if (!xfs_dir2_namecheck (sfep->name, sfep->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - dp->i_mount); +if (XFS_CORRUPT_ON (dp->i_mount, + !xfs_dir2_namecheck (sfep->name, sfep->namelen)))return -EFSCORRUPTED ; - }if (!dir_emit (ctx, (char *)sfep->name, sfep->namelen, ino,xfs_dir3_get_dtype (dp->i_mount, filetype)))return 0 ;
@@ -214,9 +212,8 @@ xfs_dir2_block_getdents(/* * If it didn't fit, set the final offset to here & return. */ -if (!xfs_dir2_namecheck (dep->name, dep->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - dp->i_mount); +if (XFS_CORRUPT_ON (dp->i_mount, + !xfs_dir2_namecheck (dep->name, dep->namelen))) { error = -EFSCORRUPTED ; goto out_rele; }
@@ -467,9 +464,8 @@ xfs_dir2_leaf_getdents( filetype = dp->d_ops->data_get_ftype (dep); ctx->pos =xfs_dir2_byte_to_dataptr (curoff) &0x7fffffff ; -if (!xfs_dir2_namecheck (dep->name, dep->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - dp->i_mount); +if (XFS_CORRUPT_ON (dp->i_mount, + !xfs_dir2_namecheck (dep->name, dep->namelen))) { error = -EFSCORRUPTED ;break ; }
fs/xfs/xfs_iomap.c +2 -5
@@ -846,11 +846,8 @@ xfs_buffered_write_iomap_begin(xfs_ilock (ip,XFS_ILOCK_EXCL ); -if (unlikely (XFS_TEST_ERROR ( - (XFS_IFORK_FORMAT (ip,XFS_DATA_FORK ) !=XFS_DINODE_FMT_EXTENTS && -XFS_IFORK_FORMAT (ip,XFS_DATA_FORK ) !=XFS_DINODE_FMT_BTREE ), - mp,XFS_ERRTAG_BMAPIFORMAT ))) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp); +if (XFS_CORRUPT_ON (mp, !XFS_IFORK_MAPS_BLOCKS (ip,XFS_DATA_FORK )) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BMAPIFORMAT )) { error = -EFSCORRUPTED ; goto out_unlock; }
fs/xfs/xfs_iops.c +1 -2
@@ -481,8 +481,7 @@ xfs_vn_get_link_inline(* if_data is junk. */ link = ip->i_df.if_u1.if_data; -if (!link) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , ip->i_mount); +if (XFS_CORRUPT_ON (ip->i_mount, !link)) {return ERR_PTR (-EFSCORRUPTED ); }return link;
fs/xfs/xfs_log_recover.c +22 -44
161 lines not on this page · raw message
fs/xfs/xfs_mount.c +2 -5
@@ -760,9 +760,8 @@ xfs_mountfs( goto out_free_dir; } -if (!sbp->sb_logblocks) { +if (XFS_CORRUPT_ON (mp, !sbp->sb_logblocks)) {xfs_warn (mp,"no log defined" ); -XFS_ERROR_REPORT ("xfs_mountfs" ,XFS_ERRLEVEL_LOW , mp); error = -EFSCORRUPTED ; goto out_free_perag; }
@@ -800,12 +799,10 @@ xfs_mountfs(ASSERT (rip !=NULL ); -if (unlikely (!S_ISDIR (VFS_I (rip)->i_mode))) { +if (XFS_CORRUPT_ON (mp, !S_ISDIR (VFS_I (rip)->i_mode))) {xfs_warn (mp,"corrupted root inode %llu: not a directory" , (unsigned long long )rip->i_ino);xfs_iunlock (rip,XFS_ILOCK_EXCL ); -XFS_ERROR_REPORT ("xfs_mountfs_int(2)" ,XFS_ERRLEVEL_LOW , - mp); error = -EFSCORRUPTED ; goto out_rele_rip; }
fs/xfs/xfs_qm.c +4 -6
@@ -755,17 +755,15 @@ xfs_qm_qino_alloc(if ((flags &XFS_QMOPT_PQUOTA ) && (mp->m_sb.sb_gquotino !=NULLFSINO )) { ino = mp->m_sb.sb_gquotino; -if (mp->m_sb.sb_pquotino !=NULLFSINO ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - mp); +if (XFS_CORRUPT_ON (mp, + mp->m_sb.sb_pquotino !=NULLFSINO )) {return -EFSCORRUPTED ; } }else if ((flags &XFS_QMOPT_GQUOTA ) && (mp->m_sb.sb_pquotino !=NULLFSINO )) { ino = mp->m_sb.sb_pquotino; -if (mp->m_sb.sb_gquotino !=NULLFSINO ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - mp); +if (XFS_CORRUPT_ON (mp, + mp->m_sb.sb_gquotino !=NULLFSINO )) {return -EFSCORRUPTED ; } }
PATCH v2 6/6 xfs: convert open coded corruption check to use XFS_IS_CORRUPT
From: Darrick J. Wong <[email protected]>
Convert the last of the open coded corruption check and report idioms to use the XFS_IS_CORRUPT macro. In a subsequent patch we are going to add health reporting to the code block under each corruption check, so we don't bother to clean out "{ return -EFSCORRUPTED; }".
--- fs/xfs/libxfs/xfs_alloc.c | 6 +-- fs/xfs/libxfs/xfs_bmap.c | 75 +++++++++++++--------------------------- fs/xfs/libxfs/xfs_btree.c | 13 +++---- fs/xfs/libxfs/xfs_da_btree.c | 58 ++++++++++++------------------- fs/xfs/libxfs/xfs_dir2.c | 8 ++-- fs/xfs/libxfs/xfs_dir2_node.c | 9 ++--- fs/xfs/libxfs/xfs_inode_fork.h | 4 ++ fs/xfs/libxfs/xfs_refcount.c | 7 ++-- fs/xfs/libxfs/xfs_rmap.c | 3 +- fs/xfs/libxfs/xfs_rtbitmap.c | 3 +- fs/xfs/xfs_attr_list.c | 20 ++++------- fs/xfs/xfs_dir2_readdir.c | 16 +++------ fs/xfs/xfs_iomap.c | 7 +--- fs/xfs/xfs_iops.c | 3 +- fs/xfs/xfs_log_recover.c | 66 ++++++++++++----------------------- fs/xfs/xfs_mount.c | 7 +--- fs/xfs/xfs_qm.c | 10 ++--- 17 files changed, 116 insertions(+), 199 deletions(-)
fs/xfs/libxfs/xfs_alloc.c +2 -4
@@ -1066,8 +1066,7 @@ xfs_alloc_ag_vextent_small(struct xfs_buf *bp; bp =xfs_btree_get_bufs (args->mp, args->tp, args->agno, fbno); -if (!bp) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , args->mp); +if (XFS_IS_CORRUPT (args->mp, !bp)) { error = -EFSCORRUPTED ; goto error; }
@@ -2318,8 +2317,7 @@ xfs_free_agfl_block(return error; bp =xfs_btree_get_bufs (tp->t_mountp, tp, agno, agbno); -if (!bp) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , tp->t_mountp); +if (XFS_IS_CORRUPT (tp->t_mountp, !bp)) {return -EFSCORRUPTED ; }xfs_trans_binval (tp, bp);
fs/xfs/libxfs/xfs_bmap.c +24 -51
161 lines not on this page · raw message
fs/xfs/libxfs/xfs_btree.c +5 -8
@@ -105,11 +105,10 @@ xfs_btree_check_lblock(xfs_failaddr_t fa; fa =__xfs_btree_check_lblock (cur, block, level, bp); -if (unlikely (XFS_TEST_ERROR (fa !=NULL , mp, -XFS_ERRTAG_BTREE_CHECK_LBLOCK ))) { +if (XFS_IS_CORRUPT (mp, fa !=NULL ) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BTREE_CHECK_LBLOCK )) {if (bp)trace_xfs_btree_corrupt (bp, _RET_IP_); -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }return 0 ;
@@ -169,11 +168,10 @@ xfs_btree_check_sblock(xfs_failaddr_t fa; fa =__xfs_btree_check_sblock (cur, block, level, bp); -if (unlikely (XFS_TEST_ERROR (fa !=NULL , mp, -XFS_ERRTAG_BTREE_CHECK_SBLOCK ))) { +if (XFS_IS_CORRUPT (mp, fa !=NULL ) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BTREE_CHECK_SBLOCK )) {if (bp)trace_xfs_btree_corrupt (bp, _RET_IP_); -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }return 0 ;
@@ -1868,8 +1866,7 @@ xfs_btree_lookup(XFS_BTREE_STATS_INC (cur, lookup);/* No such thing as a zero-level tree. */ -if (cur->bc_nlevels ==0 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , cur->bc_mp); +if (XFS_IS_CORRUPT (cur->bc_mp, cur->bc_nlevels ==0 )) {return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_da_btree.c +22 -36
131 lines not on this page · raw message
fs/xfs/libxfs/xfs_dir2.c +4 -4
@@ -191,10 +191,10 @@ xfs_dir_ino_validate( {bool ino_ok =xfs_verify_dir_ino (mp, ino); -if (unlikely (XFS_TEST_ERROR (!ino_ok, mp,XFS_ERRTAG_DIR_INO_VALIDATE ))) { +if (XFS_IS_CORRUPT (mp, !ino_ok) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_DIR_INO_VALIDATE )) {xfs_warn (mp,"Invalid inode number 0x%Lx" , (unsigned long long ) ino); -XFS_ERROR_REPORT ("xfs_dir_ino_validate" ,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }return 0 ;
@@ -600,8 +600,8 @@ xfs_dir2_isblock(if ((rval =xfs_bmap_last_offset (args->dp, &last,XFS_DATA_FORK )))return rval; rval =XFS_FSB_TO_B (args->dp->i_mount, last) == args->geo->blksize; -if (rval !=0 && args->dp->i_d.di_size != args->geo->blksize) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , args->dp->i_mount); +if (XFS_IS_CORRUPT (args->dp->i_mount, + rval !=0 && args->dp->i_d.di_size != args->geo->blksize)) {return -EFSCORRUPTED ; } *vp = rval;
fs/xfs/libxfs/xfs_dir2_node.c +4 -5
@@ -670,9 +670,8 @@ xfs_dir2_leafn_lookup_for_addname(* If it has room, return it. */ bests = dp->d_ops->free_bests_p (free); -if (unlikely (bests[fi] ==cpu_to_be16 (NULLDATAOFF ))) { -XFS_ERROR_REPORT ("xfs_dir2_leafn_lookup_int" , -XFS_ERRLEVEL_LOW , mp); +if (XFS_IS_CORRUPT (mp, + bests[fi] ==cpu_to_be16 (NULLDATAOFF ))) {if (curfdb != newfdb)xfs_trans_brelse (tp, curbp);return -EFSCORRUPTED ;
@@ -1671,7 +1670,8 @@ xfs_dir2_node_add_datablk(if (error)return error; -if (dp->d_ops->db_to_fdb (args->geo, *dbno) != fbno) { +if (XFS_IS_CORRUPT (mp, + dp->d_ops->db_to_fdb (args->geo, *dbno) != fbno)) { xfs_alert(mp, "%s: dir ino %llu needed freesp block %lld for data block %lld, got %lld", __func__, (unsigned long long)dp->i_ino,
@@ -1685,7 +1685,6 @@ xfs_dir2_node_add_datablk( }else {xfs_alert (mp," ... fblk is NULL" ); } -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp);return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_inode_fork.h +4 -0
@@ -87,6 +87,10 @@ struct xfs_ifork {#define XFS_IFORK_MAXEXT (ip, w) \ (XFS_IFORK_SIZE(ip, w) / sizeof(xfs_bmbt_rec_t)) +#define XFS_IFORK_MAPS_BLOCKS (ip, w) \ + (XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_EXTENTS || \ + XFS_IFORK_FORMAT((ip), (w)) == XFS_DINODE_FMT_BTREE) +struct xfs_ifork *xfs_iext_state_to_fork (struct xfs_inode *ip,int state);int xfs_iformat_fork (struct xfs_inode *,struct xfs_dinode *);
fs/xfs/libxfs/xfs_refcount.c +4 -3
@@ -1177,8 +1177,9 @@ xfs_refcount_finish_one( XFS_ALLOC_FLAG_FREEING, &agbp);if (error)return error; -if (!agbp) +if (XFS_IS_CORRUPT (tp->t_mountp, !agbp)) {return -EFSCORRUPTED ; + } rcur =xfs_refcountbt_init_cursor (mp, tp, agbp, agno);if (!rcur) {
@@ -1668,8 +1669,8 @@ xfs_refcount_recover_extent(struct list_head *debris = priv;struct xfs_refcount_recovery *rr; -if (be32_to_cpu (rec->refc.rc_refcount) !=1 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , cur->bc_mp); +if (XFS_IS_CORRUPT (cur->bc_mp, +be32_to_cpu (rec->refc.rc_refcount) !=1 )) {return -EFSCORRUPTED ; }
fs/xfs/libxfs/xfs_rmap.c +2 -1
@@ -2394,8 +2394,9 @@ xfs_rmap_finish_one( error =xfs_free_extent_fix_freelist (tp, agno, &agbp);if (error)return error; -if (!agbp) +if (XFS_IS_CORRUPT (tp->t_mountp, !agbp)) {return -EFSCORRUPTED ; + } rcur =xfs_rmapbt_init_cursor (mp, tp, agbp, agno);if (!rcur) {
fs/xfs/libxfs/xfs_rtbitmap.c +1 -2
@@ -70,8 +70,7 @@ xfs_rtbuf_get(if (error)return error; -if (nmap ==0 || !xfs_bmap_is_real_extent (&map)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp); +if (XFS_IS_CORRUPT (mp, nmap ==0 || !xfs_bmap_is_real_extent (&map))) {return -EFSCORRUPTED ; }
fs/xfs/xfs_attr_list.c +7 -13
@@ -86,11 +86,9 @@ xfs_attr_shortform_list( (XFS_ISRESET_CURSOR(cursor) && (dp->i_afp->if_bytes + sf->hdr.count * 16) < context->bufsize)) {for (i =0 , sfe = &sf->list[0 ]; i < sf->hdr.count; i++) { -if (!xfs_attr_namecheck (sfe->nameval, sfe->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - context->dp->i_mount); +if (XFS_IS_CORRUPT (context->dp->i_mount, + !xfs_attr_namecheck (sfe->nameval, sfe->namelen)))return -EFSCORRUPTED ; - } context->put_listent(context, sfe->flags, sfe->nameval,
@@ -179,9 +177,8 @@ xfs_attr_shortform_list( cursor->hashval = sbp->hash; cursor->offset =0 ; } -if (!xfs_attr_namecheck (sbp->name, sbp->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - context->dp->i_mount); +if (XFS_IS_CORRUPT (context->dp->i_mount, + !xfs_attr_namecheck (sbp->name, sbp->namelen))) { error = -EFSCORRUPTED ; goto out; }
@@ -269,8 +266,7 @@ xfs_attr_node_list_lookup(return 0 ;/* We can't point back to the root. */ -if (cursor->blkno ==0 ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp); +if (XFS_IS_CORRUPT (mp, cursor->blkno ==0 )) {return -EFSCORRUPTED ; } }
@@ -473,11 +469,9 @@ xfs_attr3_leaf_list_int( valuelen =be32_to_cpu (name_rmt->valuelen); } -if (!xfs_attr_namecheck (name, namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - context->dp->i_mount); +if (XFS_IS_CORRUPT (context->dp->i_mount, + !xfs_attr_namecheck (name, namelen)))return -EFSCORRUPTED ; - } context->put_listent (context, entry->flags, name, namelen, valuelen);if (context->seen_enough)
fs/xfs/xfs_dir2_readdir.c +6 -10
@@ -116,11 +116,9 @@ xfs_dir2_sf_getdents( ino = dp->d_ops->sf_get_ino (sfp, sfep); filetype = dp->d_ops->sf_get_ftype (sfep); ctx->pos = off &0x7fffffff ; -if (!xfs_dir2_namecheck (sfep->name, sfep->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - dp->i_mount); +if (XFS_IS_CORRUPT (dp->i_mount, + !xfs_dir2_namecheck (sfep->name, sfep->namelen)))return -EFSCORRUPTED ; - }if (!dir_emit (ctx, (char *)sfep->name, sfep->namelen, ino,xfs_dir3_get_dtype (dp->i_mount, filetype)))return 0 ;
@@ -214,9 +212,8 @@ xfs_dir2_block_getdents(/* * If it didn't fit, set the final offset to here & return. */ -if (!xfs_dir2_namecheck (dep->name, dep->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - dp->i_mount); +if (XFS_IS_CORRUPT (dp->i_mount, + !xfs_dir2_namecheck (dep->name, dep->namelen))) { error = -EFSCORRUPTED ; goto out_rele; }
@@ -467,9 +464,8 @@ xfs_dir2_leaf_getdents( filetype = dp->d_ops->data_get_ftype (dep); ctx->pos =xfs_dir2_byte_to_dataptr (curoff) &0x7fffffff ; -if (!xfs_dir2_namecheck (dep->name, dep->namelen)) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - dp->i_mount); +if (XFS_IS_CORRUPT (dp->i_mount, + !xfs_dir2_namecheck (dep->name, dep->namelen))) { error = -EFSCORRUPTED ;break ; }
fs/xfs/xfs_iomap.c +2 -5
@@ -846,11 +846,8 @@ xfs_buffered_write_iomap_begin(xfs_ilock (ip,XFS_ILOCK_EXCL ); -if (unlikely (XFS_TEST_ERROR ( - (XFS_IFORK_FORMAT (ip,XFS_DATA_FORK ) !=XFS_DINODE_FMT_EXTENTS && -XFS_IFORK_FORMAT (ip,XFS_DATA_FORK ) !=XFS_DINODE_FMT_BTREE ), - mp,XFS_ERRTAG_BMAPIFORMAT ))) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , mp); +if (XFS_IS_CORRUPT (mp, !XFS_IFORK_MAPS_BLOCKS (ip,XFS_DATA_FORK )) || +XFS_TEST_ERROR (false, mp,XFS_ERRTAG_BMAPIFORMAT )) { error = -EFSCORRUPTED ; goto out_unlock; }
fs/xfs/xfs_iops.c +1 -2
@@ -481,8 +481,7 @@ xfs_vn_get_link_inline(* if_data is junk. */ link = ip->i_df.if_u1.if_data; -if (!link) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , ip->i_mount); +if (XFS_IS_CORRUPT (ip->i_mount, !link)) {return ERR_PTR (-EFSCORRUPTED ); }return link;
fs/xfs/xfs_log_recover.c +22 -44
161 lines not on this page · raw message
fs/xfs/xfs_mount.c +2 -5
@@ -761,9 +761,8 @@ xfs_mountfs( goto out_free_dir; } -if (!sbp->sb_logblocks) { +if (XFS_IS_CORRUPT (mp, !sbp->sb_logblocks)) {xfs_warn (mp,"no log defined" ); -XFS_ERROR_REPORT ("xfs_mountfs" ,XFS_ERRLEVEL_LOW , mp); error = -EFSCORRUPTED ; goto out_free_perag; }
@@ -801,12 +800,10 @@ xfs_mountfs(ASSERT (rip !=NULL ); -if (unlikely (!S_ISDIR (VFS_I (rip)->i_mode))) { +if (XFS_IS_CORRUPT (mp, !S_ISDIR (VFS_I (rip)->i_mode))) {xfs_warn (mp,"corrupted root inode %llu: not a directory" , (unsigned long long )rip->i_ino);xfs_iunlock (rip,XFS_ILOCK_EXCL ); -XFS_ERROR_REPORT ("xfs_mountfs_int(2)" ,XFS_ERRLEVEL_LOW , - mp); error = -EFSCORRUPTED ; goto out_rele_rip; }
fs/xfs/xfs_qm.c +4 -6
@@ -755,17 +755,15 @@ xfs_qm_qino_alloc(if ((flags &XFS_QMOPT_PQUOTA ) && (mp->m_sb.sb_gquotino !=NULLFSINO )) { ino = mp->m_sb.sb_gquotino; -if (mp->m_sb.sb_pquotino !=NULLFSINO ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - mp); +if (XFS_IS_CORRUPT (mp, + mp->m_sb.sb_pquotino !=NULLFSINO )) {return -EFSCORRUPTED ; } }else if ((flags &XFS_QMOPT_GQUOTA ) && (mp->m_sb.sb_pquotino !=NULLFSINO )) { ino = mp->m_sb.sb_pquotino; -if (mp->m_sb.sb_gquotino !=NULLFSINO ) { -XFS_ERROR_REPORT (__func__,XFS_ERRLEVEL_LOW , - mp); +if (XFS_IS_CORRUPT (mp, + mp->m_sb.sb_gquotino !=NULLFSINO )) {return -EFSCORRUPTED ; } }