[arch-commits] Commit in linux-grsec/repos (2 files)

[Daniel Micay]

    Date: Thursday, December 10, 2015 @ 18:49:36
  Author: thestinger
Revision: 152485

archrelease: copy trunk to community-i686, community-x86_64

Deleted:
  linux-grsec/repos/community-i686/btrfs-overflow.patch
  linux-grsec/repos/community-x86_64/btrfs-overflow.patch

---------------------------------------+
 community-i686/btrfs-overflow.patch   |   26 --------------------------
 community-x86_64/btrfs-overflow.patch |   26 --------------------------
 2 files changed, 52 deletions(-)

Deleted: community-i686/btrfs-overflow.patch
===================================================================
--- community-i686/btrfs-overflow.patch	2015-12-10 17:49:07 UTC (rev 152484)
+++ community-i686/btrfs-overflow.patch	2015-12-10 17:49:36 UTC (rev 152485)
@@ -1,26 +0,0 @@
-diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
-index 6a98bdd..fed3da6 100644
---- a/fs/btrfs/extent_map.c
-+++ b/fs/btrfs/extent_map.c
-@@ -235,7 +235,9 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)
-			em->start = merge->start;
-			em->orig_start = merge->orig_start;
-			em->len += merge->len;
--			em->block_len += merge->block_len;
-+			if (em->block_start != EXTENT_MAP_HOLE &&
-+			    em->block_start != EXTENT_MAP_INLINE)
-+				em->block_len += merge->block_len;
-			em->block_start = merge->block_start;
-			em->mod_len = (em->mod_len + em->mod_start) - merge->mod_start;
-			em->mod_start = merge->mod_start;
-@@ -252,7 +254,9 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)
-		merge = rb_entry(rb, struct extent_map, rb_node);
-	if (rb && mergable_maps(em, merge)) {
-		em->len += merge->len;
--		em->block_len += merge->block_len;
-+		if (em->block_start != EXTENT_MAP_HOLE &&
-+		    em->block_start != EXTENT_MAP_INLINE)
-+			em->block_len += merge->block_len;
-		rb_erase(&merge->rb_node, &tree->map);
-		RB_CLEAR_NODE(&merge->rb_node);
-		em->mod_len = (merge->mod_start + merge->mod_len) - em->mod_start;

Deleted: community-x86_64/btrfs-overflow.patch
===================================================================
--- community-x86_64/btrfs-overflow.patch	2015-12-10 17:49:07 UTC (rev 152484)
+++ community-x86_64/btrfs-overflow.patch	2015-12-10 17:49:36 UTC (rev 152485)
@@ -1,26 +0,0 @@
-diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c
-index 6a98bdd..fed3da6 100644
---- a/fs/btrfs/extent_map.c
-+++ b/fs/btrfs/extent_map.c
-@@ -235,7 +235,9 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)
-			em->start = merge->start;
-			em->orig_start = merge->orig_start;
-			em->len += merge->len;
--			em->block_len += merge->block_len;
-+			if (em->block_start != EXTENT_MAP_HOLE &&
-+			    em->block_start != EXTENT_MAP_INLINE)
-+				em->block_len += merge->block_len;
-			em->block_start = merge->block_start;
-			em->mod_len = (em->mod_len + em->mod_start) - merge->mod_start;
-			em->mod_start = merge->mod_start;
-@@ -252,7 +254,9 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em)
-		merge = rb_entry(rb, struct extent_map, rb_node);
-	if (rb && mergable_maps(em, merge)) {
-		em->len += merge->len;
--		em->block_len += merge->block_len;
-+		if (em->block_start != EXTENT_MAP_HOLE &&
-+		    em->block_start != EXTENT_MAP_INLINE)
-+			em->block_len += merge->block_len;
-		rb_erase(&merge->rb_node, &tree->map);
-		RB_CLEAR_NODE(&merge->rb_node);
-		em->mod_len = (merge->mod_start + merge->mod_len) - em->mod_start;