chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nspawn: add new --personality= switch to make it easier to run 32bit containers on...
[elogind.git]
/
src
/
journal
/
journal-vacuum.c
diff --git
a/src/journal/journal-vacuum.c
b/src/journal/journal-vacuum.c
index 8d5effb45ce63d83046f9917632752b8351f42b9..c92c198245536c2a09a69063d0049a32c4d2d7c7 100644
(file)
--- a/
src/journal/journal-vacuum.c
+++ b/
src/journal/journal-vacuum.c
@@
-150,7
+150,6
@@
static int journal_file_empty(int dir_fd, const char *name) {
int journal_directory_vacuum(
const char *directory,
uint64_t max_use,
int journal_directory_vacuum(
const char *directory,
uint64_t max_use,
- uint64_t min_free,
usec_t max_retention_usec,
usec_t *oldest_usec) {
usec_t max_retention_usec,
usec_t *oldest_usec) {
@@
-164,7
+163,7
@@
int journal_directory_vacuum(
assert(directory);
assert(directory);
- if (max_use <= 0 && m
in_free <= 0 && m
ax_retention_usec <= 0)
+ if (max_use <= 0 && max_retention_usec <= 0)
return 0;
if (max_retention_usec > 0) {
return 0;
if (max_retention_usec > 0) {
@@
-180,9
+179,7
@@
int journal_directory_vacuum(
return -errno;
for (;;) {
return -errno;
for (;;) {
- int k;
struct dirent *de;
struct dirent *de;
- union dirent_storage buf;
size_t q;
struct stat st;
char *p;
size_t q;
struct stat st;
char *p;
@@
-190,9
+187,10
@@
int journal_directory_vacuum(
sd_id128_t seqnum_id;
bool have_seqnum;
sd_id128_t seqnum_id;
bool have_seqnum;
- k = readdir_r(d, &buf.de, &de);
- if (k != 0) {
- r = -k;
+ errno = 0;
+ de = readdir(d);
+ if (!de && errno != 0) {
+ r = -errno;
goto finish;
}
goto finish;
}
@@
-299,8
+297,7
@@
int journal_directory_vacuum(
n_list ++;
}
n_list ++;
}
- if (n_list > 0)
- qsort(list, n_list, sizeof(struct vacuum_info), vacuum_compare);
+ qsort_safe(list, n_list, sizeof(struct vacuum_info), vacuum_compare);
for (i = 0; i < n_list; i++) {
struct statvfs ss;
for (i = 0; i < n_list; i++) {
struct statvfs ss;
@@
-311,8
+308,7
@@
int journal_directory_vacuum(
}
if ((max_retention_usec <= 0 || list[i].realtime >= retention_limit) &&
}
if ((max_retention_usec <= 0 || list[i].realtime >= retention_limit) &&
- (max_use <= 0 || sum <= max_use) &&
- (min_free <= 0 || (uint64_t) ss.f_bavail * (uint64_t) ss.f_bsize >= min_free))
+ (max_use <= 0 || sum <= max_use))
break;
if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
break;
if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {