diff options
| author | David Zafman <david.zafman@inktank.com> | 2013-09-13 18:04:29 -0700 |
|---|---|---|
| committer | David Zafman <david.zafman@inktank.com> | 2013-09-23 13:12:41 -0700 |
| commit | 2f289bf325a3c1179fe861d6d09944c2e6cced77 (patch) | |
| tree | b3c1dba4a08abff2d49b49658a98a5f9f36ec584 | |
| parent | 362dba1086c3e625705278ae3de5004ca81d1dd0 (diff) | |
| download | ceph-2f289bf325a3c1179fe861d6d09944c2e6cced77.tar.gz | |
os: Fix version_stamp_is_valid() and write_vesion_stamp() error return
Caused by 341fb208aa32117f58ed4ce623f4b152f64ac72e
Signed-off-by: David Zafman <david.zafman@inktank.com>
| -rw-r--r-- | src/os/FileStore.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/os/FileStore.cc b/src/os/FileStore.cc index b8d099ae73d..2c256ad0c09 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) |