1 files changed, 12 insertions, 7 deletions

diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c
index d1c77fd0815d..0bf56e94bfe9 100644
--- a/fs/xfs/libxfs/xfs_da_btree.c
+++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -487,10 +487,8 @@ xfs_da3_split(
         ASSERT(state->path.active == 0);
         oldblk = &state->path.blk[0];
         error = xfs_da3_root_split(state, oldblk, addblk);
-        if (error) {
-                addblk->bp = NULL;
-                return error;   /* GROT: dir is inconsistent */
-        }
+        if (error)
+                goto out;
 
         /*
          * Update pointers to the node which used to be block 0 and just got
@@ -505,7 +503,10 @@ xfs_da3_split(
          */
         node = oldblk->bp->b_addr;
         if (node->hdr.info.forw) {
-                ASSERT(be32_to_cpu(node->hdr.info.forw) == addblk->blkno);
+                if (be32_to_cpu(node->hdr.info.forw) != addblk->blkno) {
+                        error = -EFSCORRUPTED;
+                        goto out;
+                }
                 node = addblk->bp->b_addr;
                 node->hdr.info.back = cpu_to_be32(oldblk->blkno);
                 xfs_trans_log_buf(state->args->trans, addblk->bp,
@@ -514,15 +515,19 @@ xfs_da3_split(
         }
         node = oldblk->bp->b_addr;
         if (node->hdr.info.back) {
-                ASSERT(be32_to_cpu(node->hdr.info.back) == addblk->blkno);
+                if (be32_to_cpu(node->hdr.info.back) != addblk->blkno) {
+                        error = -EFSCORRUPTED;
+                        goto out;
+                }
                 node = addblk->bp->b_addr;
                 node->hdr.info.forw = cpu_to_be32(oldblk->blkno);
                 xfs_trans_log_buf(state->args->trans, addblk->bp,
                                   XFS_DA_LOGRANGE(node, &node->hdr.info,
                                   sizeof(node->hdr.info)));
         }
+out:
         addblk->bp = NULL;
-        return 0;
+        return error;
 }
 
 /*