commit 86707e2e6ae26fd57670b08a9064a9ae593bb9f7
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 23 22:52:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 23 22:52:26 2020 +0000
tree a66d398950bcfb79390ab3c14d3077f71ba92877
parent a2ce57c51157aed056df391177254eaf189d44f4
parent a5f65127991131e22a93a3a0e39c472b35922aa3

Merge "logcatd: unset pinning log files" into rvc-dev

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 76a970f..b8c143d 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -122,6 +122,18 @@
     return fd;
 }
 
+static void closeLogFile(const char* pathname) {
+    int fd = open(pathname, O_WRONLY | O_CLOEXEC);
+    if (fd == -1) {
+        return;
+    }
+
+    // no need to check errors
+    __u32 set = 0;
+    ioctl(fd, F2FS_IOC_SET_PIN_FILE, &set);
+    close(fd);
+}
+
 void Logcat::RotateLogs() {
     // Can't rotate logs if we're not outputting to a file
     if (!output_file_name_) return;
@@ -152,6 +164,8 @@
             break;
         }
 
+        closeLogFile(file0.c_str());
+
         int err = rename(file0.c_str(), file1.c_str());
 
         if (err < 0 && errno != ENOENT) {