On Mon, Jun 04, 2018 at 09:49:30AM +1000, Dave Chinner wrote: > On Sun, Jun 03, 2018 at 04:22:41PM -0700, Darrick J. Wong wrote: > > From: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > > > Don't ASSERT when we encounter bad on-disk btree pointers in the debug > > check functions. Log the error to leave breadcrumbs and let the upper > > layers deal with it. > > > > Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx> > > --- > > fs/xfs/libxfs/xfs_btree.c | 23 ++++++++++++++++------- > > 1 file changed, 16 insertions(+), 7 deletions(-) > > Isn't this the same checks that were in the last patch? Can > you lift xfs_btree_check_ptr() out of the debug only code, and > make the previous patch call it? Another thought on this - we can get rid of all the ifdef DEBUG wrappers around xfs_btree_check_ptr() for debug kernels by adding: #ifdef DEBUG #define xfs_btree_debug_check_ptr xfs_btree_check_ptr else #define xfs_btree_debug_check_ptr(...) 0 #endif or do something like xfs_dir3_data_check/__xfs_dir3_data_check(). That will clean the core btree code up a fair bit... Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe linux-xfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
