diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch index d1740efc5c..05223d3d6e 100644 --- a/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch +++ b/meta/recipes-core/systemd/systemd/systemd-pam-fix-fallocate.patch | |||
@@ -1,10 +1,10 @@ | |||
1 | Upstream-Status: Denied [no desire for uclibc support] | 1 | Upstream-Status: Denied [no desire for uclibc support] |
2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 2 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
3 | 3 | ||
4 | Index: systemd-208/src/journal/journal-file.c | 4 | Index: git/src/journal/journal-file.c |
5 | =================================================================== | 5 | =================================================================== |
6 | --- systemd-208.orig/src/journal/journal-file.c 2014-02-14 00:05:05.000000000 -0800 | 6 | --- git.orig/src/journal/journal-file.c 2014-03-02 16:25:38.000000000 -0800 |
7 | +++ systemd-208/src/journal/journal-file.c 2014-02-14 00:08:41.338821677 -0800 | 7 | +++ git/src/journal/journal-file.c 2014-03-02 16:27:24.151238740 -0800 |
8 | @@ -38,6 +38,8 @@ | 8 | @@ -38,6 +38,8 @@ |
9 | #include "compress.h" | 9 | #include "compress.h" |
10 | #include "fsprg.h" | 10 | #include "fsprg.h" |
@@ -17,13 +17,13 @@ Index: systemd-208/src/journal/journal-file.c | |||
17 | @@ -316,7 +318,7 @@ | 17 | @@ -316,7 +318,7 @@ |
18 | 18 | ||
19 | static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { | 19 | static int journal_file_allocate(JournalFile *f, uint64_t offset, uint64_t size) { |
20 | uint64_t old_size, new_size, file_size; | 20 | uint64_t old_size, new_size; |
21 | - int r; | 21 | - int r; |
22 | + int r = 0; | 22 | + int r = 0; |
23 | 23 | ||
24 | assert(f); | 24 | assert(f); |
25 | 25 | ||
26 | @@ -359,9 +361,24 @@ | 26 | @@ -364,9 +366,24 @@ |
27 | /* Note that the glibc fallocate() fallback is very | 27 | /* Note that the glibc fallocate() fallback is very |
28 | inefficient, hence we try to minimize the allocation area | 28 | inefficient, hence we try to minimize the allocation area |
29 | as we can. */ | 29 | as we can. */ |
@@ -46,13 +46,13 @@ Index: systemd-208/src/journal/journal-file.c | |||
46 | + return -errno; | 46 | + return -errno; |
47 | +#endif /* HAVE_POSIX_FALLOCATE */ | 47 | +#endif /* HAVE_POSIX_FALLOCATE */ |
48 | 48 | ||
49 | /* Increase the file size a bit further than this, so that we | 49 | if (fstat(f->fd, &f->last_stat) < 0) |
50 | * we can create larger memory maps to cache */ | 50 | return -errno; |
51 | Index: systemd-208/src/journal/journald-kmsg.c | 51 | Index: git/src/journal/journald-kmsg.c |
52 | =================================================================== | 52 | =================================================================== |
53 | --- systemd-208.orig/src/journal/journald-kmsg.c 2014-02-14 00:05:05.000000000 -0800 | 53 | --- git.orig/src/journal/journald-kmsg.c 2014-03-02 16:25:38.000000000 -0800 |
54 | +++ systemd-208/src/journal/journald-kmsg.c 2014-02-14 00:05:47.498823000 -0800 | 54 | +++ git/src/journal/journald-kmsg.c 2014-03-02 16:26:35.419237826 -0800 |
55 | @@ -407,6 +407,7 @@ | 55 | @@ -408,6 +408,7 @@ |
56 | 56 | ||
57 | int server_open_kernel_seqnum(Server *s) { | 57 | int server_open_kernel_seqnum(Server *s) { |
58 | int fd; | 58 | int fd; |
@@ -60,7 +60,7 @@ Index: systemd-208/src/journal/journald-kmsg.c | |||
60 | uint64_t *p; | 60 | uint64_t *p; |
61 | 61 | ||
62 | assert(s); | 62 | assert(s); |
63 | @@ -420,8 +421,19 @@ | 63 | @@ -421,8 +422,19 @@ |
64 | log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); | 64 | log_error("Failed to open /run/systemd/journal/kernel-seqnum, ignoring: %m"); |
65 | return 0; | 65 | return 0; |
66 | } | 66 | } |