From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 3 Feb 2016 07:44:18 +0000 (+0800)
Subject: bluestore/NVMEDevice: fix fd leak
X-Git-Tag: v10.1.0~417^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83ca83029b477258f0e6ce4a6c2083dba970b7c9;p=ceph.git

bluestore/NVMEDevice: fix fd leak

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
---

diff --git a/src/os/bluestore/NVMEDevice.cc b/src/os/bluestore/NVMEDevice.cc
index 280a6e7b54cd..aea5b7ac5996 100644
--- a/src/os/bluestore/NVMEDevice.cc
+++ b/src/os/bluestore/NVMEDevice.cc
@@ -592,6 +592,8 @@ int NVMEDevice::open(string p)
   }
   char buf[100];
   r = ::read(fd, buf, sizeof(buf));
+  VOID_TEMP_FAILURE_RETRY(::close(fd));                                                                           
+  fd = -1; // defensive
   if (r <= 0) {
     r = -errno;
     derr << __func__ << " unable to read " << p << ": " << cpp_strerror(r) << dendl;