diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-03 11:58:11 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-01-03 11:58:11 -0300 |
| commit | 51bcb67418e2bd15518625a5ef58a10697f1b7fc (patch) | |
| tree | 26699493c59a1f949e4bff79e28610d69296fd09 /kernels/linux-libre-grsec-knock/btrfs-overflow.patch | |
| parent | bce80289f42c6ba143082967cec443763ed232e6 (diff) | |
linux-libre-grsec{,-knock}-4.3.3_gnu.201512282134-1: updating version
Diffstat (limited to 'kernels/linux-libre-grsec-knock/btrfs-overflow.patch')
| -rw-r--r-- | kernels/linux-libre-grsec-knock/btrfs-overflow.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/kernels/linux-libre-grsec-knock/btrfs-overflow.patch b/kernels/linux-libre-grsec-knock/btrfs-overflow.patch deleted file mode 100644 index f879b184b..000000000 --- a/kernels/linux-libre-grsec-knock/btrfs-overflow.patch +++ /dev/null @@ -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; |