---

yaml --- r: 167592 b: refs/heads/master c: 444528b h: refs/heads/master v: v3
git-mirror · Oct 14, 2009 · 557c2d8 · 557c2d8
1 parent 5e478ae
commit 557c2d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0634857488ec6e28fa22920cd0bee3c2ac07ccfd
+refs/heads/master: 444528b3e614f7f2391488d9bca8e0b872db909b
diff --git a/trunk/fs/btrfs/extent-tree.c b/trunk/fs/btrfs/extent-tree.c
@@ -3686,6 +3686,14 @@ static int pin_down_bytes(struct btrfs_trans_handle *trans,
 	if (is_data)
 		goto pinit;
 
+	/*
+	 * discard is sloooow, and so triggering discards on
+	 * individual btree blocks isn't a good plan.  Just
+	 * pin everything in discard mode.
+	 */
+	if (btrfs_test_opt(root, DISCARD))
+		goto pinit;
+
 	buf = btrfs_find_tree_block(root, bytenr, num_bytes);
 	if (!buf)
 		goto pinit;