X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=blobdiff_plain;f=fs%2Fbtrfs%2Fextent_map.c;h=9759911dd34e12365c0bc57e2a943d55c00a126c;hp=ed88f5ee4beab19bf1ad0bf8a465c815156f1817;hb=222c81dc3874b4fe98371be665d0447a36447653;hpb=1eafa6c73791e4f312324ddad9cbcaf6a1b6052b

diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
index ed88f5ee4be..9759911dd34 100644
--- a/fs/btrfs/extent_map.c
+++ b/fs/btrfs/extent_map.c
@@ -289,7 +289,8 @@ out:
 void clear_em_logging(struct extent_map_tree *tree, struct extent_map *em)
 {
 	clear_bit(EXTENT_FLAG_LOGGING, &em->flags);
-	try_merge_map(tree, em);
+	if (em->in_tree)
+		try_merge_map(tree, em);
 }
 
 /**