commit 86479a04eef8f304a13aeb8b64bcc8e506a68268
author Chris Mason <chris.mason@oracle.com> Mon Sep 10 19:58:16 2007 -0400
committer David Woodhouse <dwmw2@hera.kernel.org> Mon Sep 10 19:58:16 2007 -0400
tree cda7e66d469bcdc2f41144ea91405aeb96d1f777
parent 8e21528f87854314792aaef4d279bc9e5a9be997

Add support for defragging files via btrfsctl -d.  Avoid OOM on extent tree
defrag.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

fs/btrfs/ctree.c

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 89e282c..b41f48a 100644
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -217,6 +217,9 @@
 		       root->fs_info->generation);
 		WARN_ON(1);
 	}
+	if (buffer_defrag_done(parent))
+		return 0;
+
 	parent_node = btrfs_buffer_node(parent);
 	parent_nritems = btrfs_header_nritems(&parent_node->header);
 	parent_level = btrfs_header_level(&parent_node->header);
@@ -274,6 +277,7 @@
 		*last_ret = search_start;
 		if (parent_level == 1)
 			clear_buffer_defrag(tmp_bh);
+		set_buffer_defrag_done(tmp_bh);
 		brelse(tmp_bh);
 	}
 	return err;