From: Yan, Zheng <zyan@redhat.com>
Date: Wed, 22 Jul 2015 02:35:36 +0000 (+0800)
Subject: os/FileStore: fix pipe file descriptor leak
X-Git-Tag: v9.1.0~418^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bef39385b38a6f6b73132fef60c77c7d31b58a7b;p=ceph.git

os/FileStore: fix pipe file descriptor leak

Signed-off-by: Yan, Zheng <zyan@redhat.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index a9f4470e140f..02978781f0b6 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -3482,6 +3482,8 @@ int FileStore::_do_copy_range(int from, int to, uint64_t srcoff, uint64_t len, u
 	break;
       }
     }
+    close(pipefd[0]);
+    close(pipefd[1]);
   } else
 #endif
   {
diff --git a/src/os/GenericFileStoreBackend.cc b/src/os/GenericFileStoreBackend.cc
index bfefd42da35a..508f533ab2f6 100644
--- a/src/os/GenericFileStoreBackend.cc
+++ b/src/os/GenericFileStoreBackend.cc
@@ -178,6 +178,8 @@ int GenericFileStoreBackend::detect_features()
 	dout(0) << "detect_features: splice is supported" << dendl;
       } else
 	dout(0) << "detect_features: splice is NOT supported" << dendl;
+      close(pipefd[0]);
+      close(pipefd[1]);
     }
   }
 #endif