[issue1597] panic: assertion: parent != NULL in hammer_cursor_removed_node (v2.5.1.187.gc1543-DEV, X86_64)

[YONETANI Tomokazu]

On Thu, Nov 12, 2009 at 12:47:21PM +0100, Antonio Huete Jimenez wrote:
> This is the patch I applied:
> 
> diff --git a/sys/vfs/hammer/hammer_btree.c b/sys/vfs/hammer/hammer_btree.c
> index 6ee1e1a..7b65610 100644
> --- a/sys/vfs/hammer/hammer_btree.c
> +++ b/sys/vfs/hammer/hammer_btree.c
> @@ -2226,9 +2226,10 @@ btree_remove(hammer_cursor_t cursor)
>            hammer_cursor_deleted_element(cursor->node, 0);
>            error = btree_remove(cursor);
>            if (error == 0) {
> +                KKASSERT(node != cursor->node);
>                hammer_cursor_removed_node(
> -                    node, cursor->parent,
> -                    cursor->parent_index);
> +                   node, cursor->parent,
> +                   cursor->parent_index);
>                hammer_modify_node_all(cursor->trans, node);
>                ondisk = node->ondisk;
>                ondisk->type = HAMMER_BTREE_TYPE_DELETED;

Maybe you applied the patch by hand because the mailer mangled the spaces?
You should have changed this part

    hammer_cursor_removed_node(
	    node, cursor->parent,
	    cursor->parent_index);

to this

    hammer_cursor_removed_node(
	    node, cursor->node,
	    cursor->index);

I haven't seen a big problem after applying Matt's patch.

Cheers.