From: Ilya Dryomov <ilya.dryomov@inktank.com>
Date: Mon, 16 Dec 2013 16:57:22 +0000 (+0200)
Subject: FileJournal: use pclose() to close a popen() stream
X-Git-Tag: v0.75~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F951%2Fhead;p=ceph.git

FileJournal: use pclose() to close a popen() stream

In FileJournal::_check_disk_write_cache(), use pclose() instead of
fclose() to close a stream, created by popen().

Signed-off-by: Ilya Dryomov <ilya.dryomov@inktank.com>
---

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index b42d9f8b39c5..d482efaa5822 100644
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -224,9 +224,9 @@ void FileJournal::_check_disk_write_cache() const
   }
 
 close_f:
-  if (::fclose(fp)) {
+  if (pclose(fp)) {
     int ret = -errno;
-    derr << "_check_disk_write_cache: fclose error: " << cpp_strerror(ret)
+    derr << "_check_disk_write_cache: pclose failed: " << cpp_strerror(ret)
 	 << dendl;
   }
 done: