X-Git-Url: https://git.stricted.de/?p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git;a=blobdiff_plain;f=fs%2Fbtrfs%2Fdisk-io.c;h=d70ee41d08de58bc90960e183a9661ef5d09b64e;hp=c0fc047e6bfce2cbf781f4389daf36a0764c9768;hb=d242a5721cfaa22be666712d2788c6a9ad3f2fa5;hpb=44c8e3c96a709171866e96135c223680192a2709

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index c0fc047e6bfc..d70ee41d08de 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3861,12 +3861,6 @@ again:
 		if (ret)
 			break;
 
-		/* opt_discard */
-		if (btrfs_test_opt(root, DISCARD))
-			ret = btrfs_error_discard_extent(root, start,
-							 end + 1 - start,
-							 NULL);
-
 		clear_extent_dirty(unpin, start, end, GFP_NOFS);
 		btrfs_error_unpin_extent_range(root, start, end);
 		cond_resched();