diff --git a/fs/xfs/xfs_attr.c b/fs/xfs/xfs_attr.c
index 176dbb66282d4910f9b14ec401912cbed8a89838..ddcf2267ffa6fdf1bcf33cf7439c6b379472c2b4 100644
--- a/fs/xfs/xfs_attr.c
+++ b/fs/xfs/xfs_attr.c
@@ -1014,6 +1014,7 @@ xfs_attr_node_addname(xfs_da_args_t *args)
 			 * have been a b-tree.
 			 */
 			xfs_da_state_free(state);
+			state = NULL;
 			xfs_bmap_init(args->flist, args->firstblock);
 			error = xfs_attr3_leaf_to_node(args);
 			if (!error) {