Merge pull request #7707 from xiexingguo/xxg-wip-14815

osd: filestore: fix wrong scope of result code for error cases during mount Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Mar 11, 2016 · 56fe749 · 56fe749
2 parents 4adeb41 + 7be19c2
commit 56fe749
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc
@@ -1466,6 +1466,7 @@ int FileStore::mount()
 
   op_fd = read_op_seq(&initial_op_seq);
   if (op_fd < 0) {
+    ret = op_fd;
     derr << "FileStore::mount: read_op_seq failed" << dendl;
     goto close_current_fd;
   }
@@ -1482,6 +1483,7 @@ int FileStore::mount()
     // from it.
     int r = ::creat(nosnapfn, 0644);
     if (r < 0) {
+      ret = -errno;
       derr << "FileStore::mount: failed to create current/nosnap" << dendl;
       goto close_current_fd;
     }