Merge pull request #25779 from bluca/journa_remote_vacuum

journal-remote: follow-ups for #25076

2 files changed, 4 insertions, 4 deletions

diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 476c9ad972..29f05891f5 100644
--- a/src/journal-remote/journal-remote-main.c
+++ b/src/journal-remote/journal-remote-main.c
@@ -1148,7 +1148,7 @@ static int run(int argc, char **argv) {
         journal_reset_metrics(&s.metrics);
         s.metrics.max_use = arg_max_use;
         s.metrics.max_size = arg_max_size;
-        s.metrics.max_size = arg_keep_free;
+        s.metrics.keep_free = arg_keep_free;
         s.metrics.n_max_files = arg_n_max_files;
 
         r = create_remoteserver(&s, key, cert, trust);
diff --git a/src/journal-remote/journal-remote-write.c b/src/journal-remote/journal-remote-write.c
index 2e58c6d91e..f6c3d83732 100644
--- a/src/journal-remote/journal-remote-write.c
+++ b/src/journal-remote/journal-remote-write.c
@@ -22,7 +22,7 @@ static int do_rotate(ManagedJournalFile **f, MMapCache *m, JournalFileFlags file
 }
 
 Writer* writer_new(RemoteServer *server) {
-        Writer *w;
+        _cleanup_(writer_unrefp) Writer *w = NULL;
         int r;
 
         w = new0(Writer, 1);
@@ -33,7 +33,7 @@ Writer* writer_new(RemoteServer *server) {
 
         w->mmap = mmap_cache_new();
         if (!w->mmap)
-                return mfree(w);
+                return NULL;
 
         w->n_ref = 1;
         w->server = server;
@@ -50,7 +50,7 @@ Writer* writer_new(RemoteServer *server) {
                 }
         }
 
-        return w;
+        return TAKE_PTR(w);
 }
 
 static Writer* writer_free(Writer *w) {