[arch-commits] Commit in linux-grsec/trunk (PKGBUILD btrfs-overflow.patch)

[Daniel Micay]

    Date: Wednesday, December 23, 2015 @ 10:15:22
  Author: thestinger
Revision: 154321

upgpkg: linux-grsec 4.3.3.201512222129-1

Modified:
  linux-grsec/trunk/PKGBUILD
Deleted:
  linux-grsec/trunk/btrfs-overflow.patch

----------------------+
 PKGBUILD             |   12 ++++--------
 btrfs-overflow.patch |   26 --------------------------
 2 files changed, 4 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-23 06:05:05 UTC (rev 154320)
+++ PKGBUILD	2015-12-23 09:15:22 UTC (rev 154321)
@@ -9,7 +9,7 @@
 _srcname=linux-4.3
 _pkgver=4.3.3
 _grsecver=3.1
-_timestamp=201512162141
+_timestamp=201512222129
 _grsec_patch="grsecurity-$_grsecver-$_pkgver-$_timestamp.patch"
 pkgver=$_pkgver.$_timestamp
 pkgrel=1
@@ -28,20 +28,18 @@
         'config' 'config.x86_64'
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
-        'change-default-console-loglevel.patch'
-        'btrfs-overflow.patch')
+        'change-default-console-loglevel.patch')
 
 sha256sums=('4a622cc84b8a3c38d39bc17195b0c064d2b46945dfde0dae18f77b120bc9f3ae'
             'SKIP'
             '95cd81fcbb87953f672150d60950548edc04a88474c42de713b91811557fefa5'
             'SKIP'
-            '7dd3a3c77740a952c2a51b2349e2ca03a6f1a4fee6343c0b492f001cc283cc19'
+            '59f2f5ee4e921a9f4a1601e7069eb46c768782441e678b873ddbfb607253ab67'
             'SKIP'
             '6beef54b29575e93d27f390857f8de92d21bc5c726671d24e182eefe54d541c6'
             'ccf8cde2be433a374e672c6cc5c4920e6b2d1541fab1183ea49258090c077d00'
             'ca7e718375b3790888756cc0a64a7500cd57dddb9bf7e10a0df22c860d91f74d'
-            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '82efb1d533b579e8ea6103456e76ace1f749c9f055b0eaf95b980dc9ae544e5f')
+            '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
               '647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -64,8 +62,6 @@
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  patch -p1 -i "$srcdir/btrfs-overflow.patch"
-
   # Add grsecurity patches
   patch -Np1 -i "$srcdir/$_grsec_patch"
   rm localversion-grsec

Deleted: btrfs-overflow.patch
===================================================================
--- btrfs-overflow.patch	2015-12-23 06:05:05 UTC (rev 154320)
+++ btrfs-overflow.patch	2015-12-23 09:15:22 UTC (rev 154321)
@@ -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;