Merge pull request ceph#12863 from dillaman/wip-rbd-coverity

librbd: resolve static analyser warnings Reviewed-by: Mykola Golub <[email protected]>
att · Jan 12, 2017 · 5b97cce · 5b97cce
2 parents 60c3667 + 5f2689b
commit 5b97cce
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/src/cls/rbd/cls_rbd.cc b/src/cls/rbd/cls_rbd.cc
@@ -2712,19 +2712,19 @@ int metadata_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
 int snapshot_get_limit(cls_method_context_t hctx, bufferlist *in,
 		       bufferlist *out)
 {
-  int rc;
   uint64_t snap_limit;
-
-  rc = read_key(hctx, "snap_limit", &snap_limit);
-  if (rc == -ENOENT) {
-    rc = 0;
-    ::encode(UINT64_MAX, *out);
-  } else {
-    ::encode(snap_limit, *out);
+  int r = read_key(hctx, "snap_limit", &snap_limit);
+  if (r == -ENOENT) {
+    snap_limit = UINT64_MAX;
+  } else if (r < 0) {
+    CLS_ERR("error retrieving snapshot limit: %s", cpp_strerror(r).c_str());
+    return r;
   }
 
   CLS_LOG(20, "read snapshot limit %lu", snap_limit);
-  return rc;
+  ::encode(snap_limit, *out);
+
+  return 0;
 }
 
 int snapshot_set_limit(cls_method_context_t hctx, bufferlist *in,
@@ -3777,7 +3777,10 @@ int mirror_peer_add(cls_method_context_t hctx, bufferlist *in,
 
   std::string mirror_uuid;
   r = mirror::uuid_get(hctx, &mirror_uuid);
-  if (mirror_peer.uuid == mirror_uuid) {
+  if (r < 0) {
+    CLS_ERR("error retrieving mirroring uuid: %s", cpp_strerror(r).c_str());
+    return r;
+  } else if (mirror_peer.uuid == mirror_uuid) {
     CLS_ERR("peer uuid '%s' matches pool mirroring uuid",
             mirror_uuid.c_str());
     return -EINVAL;

diff --git a/src/librbd/AioImageRequest.cc b/src/librbd/AioImageRequest.cc
@@ -472,7 +472,7 @@ uint64_t AioImageWrite<I>::append_journal_event(
     const AioObjectRequests &requests, bool synchronous) {
   I &image_ctx = this->m_image_ctx;
 
-  uint64_t tid;
+  uint64_t tid = 0;
   uint64_t buffer_offset = 0;
   assert(!this->m_image_extents.empty());
   for (auto &extent : this->m_image_extents) {
@@ -561,7 +561,7 @@ uint64_t AioImageDiscard<I>::append_journal_event(
     const AioObjectRequests &requests, bool synchronous) {
   I &image_ctx = this->m_image_ctx;
 
-  uint64_t tid;
+  uint64_t tid = 0;
   assert(!this->m_image_extents.empty());
   for (auto &extent : this->m_image_extents) {
     journal::EventEntry event_entry(journal::AioDiscardEvent(extent.first,

diff --git a/src/librbd/image/CreateRequest.cc b/src/librbd/image/CreateRequest.cc
@@ -415,7 +415,7 @@ Context *CreateRequest<I>::handle_negotiate_features(int *result) {
   ldout(m_cct, 20) << __func__ << ": r=" << *result << dendl;
 
   uint64_t all_features;
-  if (*result == 0) {
+  if (*result >= 0) {
     bufferlist::iterator it = m_outbl.begin();
     *result = cls_client::get_all_features_finish(&it, &all_features);
   }

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
@@ -3062,6 +3062,7 @@ void filter_out_mirror_watchers(ImageCtx *ictx,
           if (r < 0) {
             lderr(cct) << "error enabling mirroring for image "
                        << img_pair.first << ": " << cpp_strerror(r) << dendl;
+            img_ctx->state->close();
             return r;
           }