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 | 28 |
1 files changed, 14 insertions, 14 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 d25acefb59..cfca0b95a6 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-209/src/journal/journal-file.c | 4 | Index: git/src/journal/journal-file.c |
5 | =================================================================== | 5 | =================================================================== |
6 | --- systemd-209.orig/src/journal/journal-file.c 2014-02-12 18:42:33.000000000 -0800 | 6 | --- git.orig/src/journal/journal-file.c 2014-04-22 22:53:05.000000000 -0700 |
7 | +++ systemd-209/src/journal/journal-file.c 2014-02-19 23:23:19.464631643 -0800 | 7 | +++ git/src/journal/journal-file.c 2014-04-22 22:53:51.130236707 -0700 |
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" |
@@ -14,7 +14,7 @@ Index: systemd-209/src/journal/journal-file.c | |||
14 | #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) | 14 | #define DEFAULT_DATA_HASH_TABLE_SIZE (2047ULL*sizeof(HashItem)) |
15 | #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) | 15 | #define DEFAULT_FIELD_HASH_TABLE_SIZE (333ULL*sizeof(HashItem)) |
16 | 16 | ||
17 | @@ -316,7 +318,7 @@ | 17 | @@ -314,7 +316,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; | 20 | uint64_t old_size, new_size; |
@@ -23,7 +23,7 @@ Index: systemd-209/src/journal/journal-file.c | |||
23 | 23 | ||
24 | assert(f); | 24 | assert(f); |
25 | 25 | ||
26 | @@ -364,9 +366,24 @@ | 26 | @@ -362,9 +364,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. */ |
@@ -48,19 +48,19 @@ Index: systemd-209/src/journal/journal-file.c | |||
48 | 48 | ||
49 | if (fstat(f->fd, &f->last_stat) < 0) | 49 | if (fstat(f->fd, &f->last_stat) < 0) |
50 | return -errno; | 50 | return -errno; |
51 | Index: systemd-209/src/journal/journald-kmsg.c | 51 | Index: git/src/journal/journald-kmsg.c |
52 | =================================================================== | 52 | =================================================================== |
53 | --- systemd-209.orig/src/journal/journald-kmsg.c 2014-02-19 15:03:09.000000000 -0800 | 53 | --- git.orig/src/journal/journald-kmsg.c 2014-04-22 22:53:05.000000000 -0700 |
54 | +++ systemd-209/src/journal/journald-kmsg.c 2014-02-19 23:22:14.396630422 -0800 | 54 | +++ git/src/journal/journald-kmsg.c 2014-04-22 22:54:27.830236809 -0700 |
55 | @@ -441,6 +441,7 @@ | 55 | @@ -437,6 +437,7 @@ |
56 | |||
57 | int server_open_kernel_seqnum(Server *s) { | 56 | int server_open_kernel_seqnum(Server *s) { |
58 | int fd; | 57 | _cleanup_close_ int fd; |
59 | + int r = 0; | ||
60 | uint64_t *p; | 58 | uint64_t *p; |
59 | + int r = 0; | ||
61 | 60 | ||
62 | assert(s); | 61 | assert(s); |
63 | @@ -454,8 +455,19 @@ | 62 | |
63 | @@ -449,8 +450,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 | } |
@@ -80,5 +80,5 @@ Index: systemd-209/src/journal/journald-kmsg.c | |||
80 | +#endif /* HAVE_POSIX_FALLOCATE */ | 80 | +#endif /* HAVE_POSIX_FALLOCATE */ |
81 | + if (r < 0) { | 81 | + if (r < 0) { |
82 | log_error("Failed to allocate sequential number file, ignoring: %m"); | 82 | log_error("Failed to allocate sequential number file, ignoring: %m"); |
83 | close_nointr_nofail(fd); | ||
84 | return 0; | 83 | return 0; |
84 | } | ||