#include "coredump-vacuum.h"
#include "dirent-util.h"
#include "fd-util.h"
+#include "fs-util.h"
#include "hashmap.h"
#include "macro.h"
#include "string-util.h"
if (r <= 0)
return r;
- if (unlinkat(dirfd(d), worst->oldest_file, 0) < 0) {
+ r = unlinkat_deallocate(dirfd(d), worst->oldest_file, 0);
+ if (r == -ENOENT)
+ continue;
+ if (r < 0)
+ return log_error_errno(r, "Failed to remove file %s: %m", worst->oldest_file);
- if (errno == ENOENT)
- continue;
-
- return log_error_errno(errno, "Failed to remove file %s: %m", worst->oldest_file);
- } else
- log_info("Removed old coredump %s.", worst->oldest_file);
+ log_info("Removed old coredump %s.", worst->oldest_file);
}
return 0;
#include "alloc-util.h"
#include "dirent-util.h"
#include "fd-util.h"
+#include "fs-util.h"
#include "journal-def.h"
#include "journal-file.h"
#include "journal-vacuum.h"
if (r > 0) {
/* Always vacuum empty non-online files. */
- if (unlinkat(dirfd(d), p, 0) >= 0) {
+ r = unlinkat_deallocate(dirfd(d), p, 0);
+ if (r >= 0) {
log_full(verbose ? LOG_INFO : LOG_DEBUG,
"Deleted empty archived journal %s/%s (%s).", directory, p, format_bytes(sbytes, sizeof(sbytes), size));
freed += size;
- } else if (errno != ENOENT)
- log_warning_errno(errno, "Failed to delete empty archived journal %s/%s: %m", directory, p);
+ } else if (r != -ENOENT)
+ log_warning_errno(r, "Failed to delete empty archived journal %s/%s: %m", directory, p);
continue;
}
(n_max_files <= 0 || left <= n_max_files))
break;
- if (unlinkat(dirfd(d), list[i].filename, 0) >= 0) {
+ r = unlinkat_deallocate(dirfd(d), list[i].filename, 0);
+ if (r >= 0) {
log_full(verbose ? LOG_INFO : LOG_DEBUG, "Deleted archived journal %s/%s (%s).", directory, list[i].filename, format_bytes(sbytes, sizeof(sbytes), list[i].usage));
freed += list[i].usage;
else
sum = 0;
- } else if (errno != ENOENT)
- log_warning_errno(errno, "Failed to delete archived journal %s/%s: %m", directory, list[i].filename);
+ } else if (r != -ENOENT)
+ log_warning_errno(r, "Failed to delete archived journal %s/%s: %m", directory, list[i].filename);
}
if (oldest_usec && i < n_list && (*oldest_usec == 0 || list[i].realtime < *oldest_usec))