commit 928bdbf5ecfa1ce6ea1b47ce63dd328b03845d27
author Jaegeuk Kim <jaegeuk@google.com> Thu Apr 23 20:53:25 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 23 20:53:25 2020 +0000
tree 6a566bf79342301955588ae41ede99c7d1535f27
parent efe9defc65b2b0c9f6cf3b329dc161190f8efcf9
parent 2e5b7c425f82041e3b51fb318df8d8e5de9b9796

Merge "logcatd: unset pinning log files"

logcat/logcat.cpp

diff --git a/logcat/logcat.cpp b/logcat/logcat.cpp
index 9a06023..8185f01 100644
--- a/logcat/logcat.cpp
+++ b/logcat/logcat.cpp
@@ -123,6 +123,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;
@@ -153,6 +165,8 @@
             break;
         }
 
+        closeLogFile(file0.c_str());
+
         int err = rename(file0.c_str(), file1.c_str());
 
         if (err < 0 && errno != ENOENT) {