FileStore: close correct fd in version_stamp methods

version_stamp_is_valid and write_version_stamp previously closed op_fd
rather than fd causing write_op_sep to fail in sync_entry.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index a34e5f787b63284df04ef6e7c1e6952b9ca1e165..86281ab9982d2fd9b419a6e47e266cc4e2710c39 100644 (file)
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -1268,7 +1268,7 @@ int FileStore::version_stamp_is_valid(uint32_t *version)
   }
   bufferptr bp(PATH_MAX);
   int ret = safe_read(fd, bp.c_str(), bp.length());
-  TEMP_FAILURE_RETRY(::close(op_fd));
+  TEMP_FAILURE_RETRY(::close(fd));
   if (ret < 0)
     return -errno;
   bufferlist bl;
@@ -1292,7 +1292,7 @@ int FileStore::write_version_stamp()
   ::encode(on_disk_version, bl);
   
   int ret = safe_write(fd, bl.c_str(), bl.length());
-  TEMP_FAILURE_RETRY(::close(op_fd));
+  TEMP_FAILURE_RETRY(::close(fd));
   if (ret < 0)
     return -errno;
   return 0;