From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Tue, 24 Jan 2012 21:23:21 +0000 (-0800)
Subject: filestore: fix non-::-prefixed close
X-Git-Tag: v0.41~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3d200c0da44cb7c98110a0aa9d839f30a2aeb80;p=ceph.git

filestore: fix non-::-prefixed close

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index 5719d9eda6f2..64ab11b65385 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -268,7 +268,7 @@ int FileStore::lfn_open(coll_t cid, const hobject_t& oid, int flags, mode_t mode
   if ((flags & O_CREAT) && (!exist)) {
     r = index->created(oid, path->path());
     if (r < 0) {
-      close(fd);
+      TEMP_FAILURE_RETRY(::close(fd));
       derr << "error creating " << oid << " (" << path->path()
 	   << ") in index: " << cpp_strerror(-r) << dendl;
       return r;