Index: tools/android/forwarder2/daemon.cc |
diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc |
index 19a1054c0e93de26d5d69e5de80f6ee1198f983d..75de3ba325fa4f330b9ab952ee66b492895fa66c 100644 |
--- a/tools/android/forwarder2/daemon.cc |
+++ b/tools/android/forwarder2/daemon.cc |
@@ -98,31 +98,6 @@ void SigChildHandler(int signal_number) { |
SIGNAL_SAFE_LOG(ERROR, string_builder.buffer()); |
} |
-// Note that 0 is written to |lock_owner_pid| in case the file is not locked. |
-bool GetFileLockOwnerPid(int fd, pid_t* lock_owner_pid) { |
- struct flock lock_info = {}; |
- lock_info.l_type = F_WRLCK; |
- lock_info.l_whence = SEEK_CUR; |
- const int ret = HANDLE_EINTR(fcntl(fd, F_GETLK, &lock_info)); |
- if (ret < 0) { |
- if (errno == EBADF) { |
- // Assume that the provided file descriptor corresponding to the PID file |
- // was valid until the daemon removed this file. |
- *lock_owner_pid = 0; |
- return true; |
- } |
- PError("fcntl"); |
- return false; |
- } |
- if (lock_info.l_type == F_UNLCK) { |
- *lock_owner_pid = 0; |
- return true; |
- } |
- CHECK_EQ(F_WRLCK /* exclusive lock */, lock_info.l_type); |
- *lock_owner_pid = lock_info.l_pid; |
- return true; |
-} |
- |
scoped_ptr<Socket> ConnectToUnixDomainSocket( |
const std::string& socket_name, |
int tries_count, |