diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index b83e54c7090692a0ced6ac1e00be6f7c76954359..a51e2de3eb5a0952babc8675cf3bd20c35975481 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -1970,7 +1970,11 @@ xfs_difree_inobt(
 	 */
 	off = agino - rec.ir_startino;
 	ASSERT(off >= 0 && off < XFS_INODES_PER_CHUNK);
-	ASSERT(!(rec.ir_free & XFS_INOBT_MASK(off)));
+
+	if (XFS_IS_CORRUPT(mp, rec.ir_free & XFS_INOBT_MASK(off))) {
+		error = -EFSCORRUPTED;
+		goto error0;
+	}
 	/*
 	 * Mark the inode free & increment the count.
 	 */
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 7606ce475088edb0268c4cb7ca207a0d315e5e5d..c45c54f73238f9a1c5b69d2ea7d79af7e27b9138 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -3220,8 +3220,12 @@ xlog_do_recovery_pass(
 	 * Submit buffers that have been added from the last record processed,
 	 * regardless of error status.
 	 */
-	if (!list_empty(&buffer_list))
+	if (!list_empty(&buffer_list)) {
+		if (error)
+			xfs_force_shutdown(log->l_mp, SHUTDOWN_META_IO_ERROR);
+
 		error2 = xfs_buf_delwri_submit(&buffer_list);
+	}
 
 	if (error && first_bad)
 		*first_bad = rhead_blk;