From: David Zafman <david.zafman@inktank.com>
Date: Sat, 14 Sep 2013 01:04:29 +0000 (-0700)
Subject: os: Fix version_stamp_is_valid() and write_version_stamp() error return
X-Git-Tag: v0.71~69^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98b3cd3a784e9a7514e7f1addeb749c44a5dfef6;p=ceph.git

os: Fix version_stamp_is_valid() and write_version_stamp() error return

Caused by 341fb208aa32117f58ed4ce623f4b152f64ac72e

Signed-off-by: David Zafman <david.zafman@inktank.com>
---

diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc
index b8d099ae73d3..2c256ad0c097 100644
--- a/src/os/FileStore.cc
+++ b/src/os/FileStore.cc
@@ -937,7 +937,7 @@ int FileStore::version_stamp_is_valid(uint32_t *version)
   int ret = safe_read(fd, bp.c_str(), bp.length());
   TEMP_FAILURE_RETRY(::close(fd));
   if (ret < 0)
-    return -errno;
+    return ret;
   bufferlist bl;
   bl.push_back(bp);
   bufferlist::iterator i = bl.begin();
@@ -960,9 +960,7 @@ int FileStore::write_version_stamp()
   
   int ret = safe_write(fd, bl.c_str(), bl.length());
   TEMP_FAILURE_RETRY(::close(fd));
-  if (ret < 0)
-    return -errno;
-  return 0;
+  return ret;
 }
 
 int FileStore::read_op_seq(uint64_t *seq)