chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: downgrade vaccuum message to debug level
[elogind.git]
/
src
/
journal
/
journal-vacuum.c
diff --git
a/src/journal/journal-vacuum.c
b/src/journal/journal-vacuum.c
index b2b47d69b2af815972133869c5618fffe165dc9c..ebe5e4218e6404e387f0c9d38c1601f3a6183f76 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) {
@@
-309,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) {
@@
-335,7
+333,7
@@
finish:
free(list[i].filename);
free(list);
free(list[i].filename);
free(list);
- log_
info
("Vacuuming done, freed %"PRIu64" bytes", freed);
+ log_
debug
("Vacuuming done, freed %"PRIu64" bytes", freed);
return r;
}
return r;
}