← Back to branch summary

~ubuntu-branches/debian/jessie/btrfs-tools/jessie

« back to all changes in this revision

Viewing changes to debian/patches/0003-Fixing-unaligned-memory-accesses.patch

  • Committer: Package Import Robot
  • Author(s): Dimitri John Ledkov
  • Date: 2014-09-21 02:05:14 UTC
  • mfrom: (1.2.13) (6.1.38 sid)
  • Revision ID: package-import@ubuntu.com-20140921020514-kx4b23aw4grvevrc
Tags: 3.16-1
* New upstream release.
* Add asciidoc & xmlto build dependencies.
* Disable test-suites for now, should be run as autopkgtests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0003-Fixing-unaligned-memory-accesses.patch
1
 
From b62c1444d709ab697077323a4bc9a45b5bb50efe Mon Sep 17 00:00:00 2001
 
1
From 045f22617bc254621a2fde52cb88380849b41158 Mon Sep 17 00:00:00 2001
2
2
From: Shawn Landen <shawnlandden@gmail.com>
3
3
Date: Sat, 19 Apr 2014 11:40:37 +0100
4
4
Subject: Fixing unaligned memory accesses.
11
11
 2 files changed, 17 insertions(+), 6 deletions(-)
12
12
 
13
13
diff --git a/ctree.h b/ctree.h
14
 
index a4d2cd1..0c1dea3 100644
 
14
index fa73c4a..92c6ad3 100644
15
15
--- a/ctree.h
16
16
+++ b/ctree.h
17
17
@@ -19,6 +19,8 @@
23
23
 #if BTRFS_FLAT_INCLUDES
24
24
 #include "list.h"
25
25
 #include "kerncompat.h"
26
 
@@ -1187,13 +1189,17 @@ struct btrfs_root {
 
26
@@ -1191,13 +1193,17 @@ struct btrfs_root {
27
27
 static inline u##bits btrfs_##name(const struct extent_buffer *eb)     \
28
28
 {                                                                      \
29
29
        const struct btrfs_header *h = (struct btrfs_header *)eb->data; \
43
43
 }
44
44
 
45
45
 #define BTRFS_SETGET_FUNCS(name, type, member, bits)                   \
46
 
@@ -1215,11 +1221,15 @@ static inline void btrfs_set_##name(struct extent_buffer *eb,           \
 
46
@@ -1219,11 +1225,15 @@ static inline void btrfs_set_##name(struct extent_buffer *eb,           \
47
47
 #define BTRFS_SETGET_STACK_FUNCS(name, type, member, bits)             \
48
48
 static inline u##bits btrfs_##name(const type *s)                      \
49
49
 {                                                                      \
62
62
 
63
63
 BTRFS_SETGET_FUNCS(device_type, struct btrfs_dev_item, type, 64);
64
64
diff --git a/volumes.c b/volumes.c
65
 
index 77ffd32..61d7e8e 100644
 
65
index 388c94e..102380b 100644
66
66
--- a/volumes.c
67
67
+++ b/volumes.c
68
 
@@ -465,10 +465,11 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset)
 
68
@@ -472,10 +472,11 @@ static int find_next_chunk(struct btrfs_root *root, u64 objectid, u64 *offset)
69
69
                if (found_key.objectid != objectid)
70
70
                        *offset = 0;
71
71
                else {