From: Alexandre Oliva <lxoliva@fsfla.org>
Date: Mon, 28 Nov 2011 14:36:17 +0000 (-0200)
Subject: Btrfs: don't set up allocation result twice
X-Git-Tag: v2.6.39-400.9.0~654
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a8af21a212c4e440a8be9c0df939da154462cda6;p=users%2Fjedix%2Flinux-maple.git

Btrfs: don't set up allocation result twice

We store the allocation start and length twice in ins, once right
after the other, but with intervening calls that may prevent the
duplicate from being optimized out by the compiler.  Remove one of the
assignments.

Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
(cherry picked from commit fc7c1077ceb99c35e5f9d0ce03dc7740565bb2bf)
---

diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
index a11b7b713cc1..6ebe2d414c2e 100644
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
@@ -5440,9 +5440,6 @@ checks:
 			goto loop;
 		}
 
-		ins->objectid = search_start;
-		ins->offset = num_bytes;
-
 		if (offset < search_start)
 			btrfs_add_free_space(used_block_group, offset,
 					     search_start - offset);