From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Mon, 1 Jun 2020 11:27:49 +0000 (+0200)
Subject: global: don't override the pidfile-locking errno.
X-Git-Tag: v16.1.0~2155^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F35337%2Fhead;p=ceph.git

global: don't override the pidfile-locking errno.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/global/pidfile.cc b/src/global/pidfile.cc
index 69b8467b37e3..b259668b3b23 100644
--- a/src/global/pidfile.cc
+++ b/src/global/pidfile.cc
@@ -177,9 +177,10 @@ int pidfh::open(std::string_view pid_file)
       derr << __func__ << ": failed to lock pidfile "
 	   << pf_path << "': " << cpp_strerror(errno) << dendl;
     }
+    const auto lock_errno = errno;
     ::close(pf_fd);
     reset();
-    return -errno;
+    return -lock_errno;
   }
   return 0;
 }