Merge pull request #18129 from dragonylffly/wip-fix-coverity-warning-…

…for-uninialized-member librbd: fix coverity warning for uninitialized member Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Oct 16, 2017 · 78e5c0f · 78e5c0f
2 parents 6a64eef + 2a8e8c5
commit 78e5c0f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/src/librbd/operation/SnapshotProtectRequest.cc b/src/librbd/operation/SnapshotProtectRequest.cc
@@ -33,7 +33,8 @@ SnapshotProtectRequest<I>::SnapshotProtectRequest(I &image_ctx,
                                                   Context *on_finish,
 						  const cls::rbd::SnapshotNamespace &snap_namespace,
 						  const std::string &snap_name)
-  : Request<I>(image_ctx, on_finish), m_snap_namespace(snap_namespace), m_snap_name(snap_name) {
+  : Request<I>(image_ctx, on_finish), m_snap_namespace(snap_namespace),
+    m_snap_name(snap_name), m_state(STATE_PROTECT_SNAP) {
 }
 
 template <typename I>
@@ -65,8 +66,6 @@ void SnapshotProtectRequest<I>::send_protect_snap() {
   CephContext *cct = image_ctx.cct;
   ldout(cct, 5) << this << " " << __func__ << dendl;
 
-  m_state = STATE_PROTECT_SNAP;
-
   int r = verify_and_send_protect_snap();
   if (r < 0) {
     this->async_complete(r);

diff --git a/src/librbd/operation/SnapshotRemoveRequest.cc b/src/librbd/operation/SnapshotRemoveRequest.cc
@@ -52,7 +52,7 @@ SnapshotRemoveRequest<I>::SnapshotRemoveRequest(I &image_ctx,
 						const std::string &snap_name,
 						uint64_t snap_id)
   : Request<I>(image_ctx, on_finish), m_snap_namespace(snap_namespace),
-    m_snap_name(snap_name), m_snap_id(snap_id) {
+    m_snap_name(snap_name), m_snap_id(snap_id), m_state(STATE_REMOVE_OBJECT_MAP) {
 }
 
 template <typename I>
@@ -114,7 +114,6 @@ void SnapshotRemoveRequest<I>::send_remove_object_map() {
 
     if (image_ctx.object_map != nullptr) {
       ldout(cct, 5) << this << " " << __func__ << dendl;
-      m_state = STATE_REMOVE_OBJECT_MAP;
 
       image_ctx.object_map->snapshot_remove(
         m_snap_id, this->create_callback_context());

diff --git a/src/librbd/operation/SnapshotRenameRequest.cc b/src/librbd/operation/SnapshotRenameRequest.cc
@@ -34,7 +34,8 @@ SnapshotRenameRequest<I>::SnapshotRenameRequest(I &image_ctx,
 						Context *on_finish,
 						uint64_t snap_id,
 						const std::string &snap_name)
-  : Request<I>(image_ctx, on_finish), m_snap_id(snap_id), m_snap_name(snap_name) {
+  : Request<I>(image_ctx, on_finish), m_snap_id(snap_id),
+    m_snap_name(snap_name), m_state(STATE_RENAME_SNAP) {
 }
 
 template <typename I>
@@ -83,8 +84,6 @@ void SnapshotRenameRequest<I>::send_rename_snap() {
   CephContext *cct = image_ctx.cct;
   ldout(cct, 5) << this << " " << __func__ << dendl;
 
-  m_state = STATE_RENAME_SNAP;
-
   librados::ObjectWriteOperation op;
   if (image_ctx.old_format) {
     cls_client::old_snapshot_rename(&op, m_snap_id, m_snap_name);

diff --git a/src/librbd/operation/SnapshotUnprotectRequest.cc b/src/librbd/operation/SnapshotUnprotectRequest.cc
@@ -155,7 +155,8 @@ SnapshotUnprotectRequest<I>::SnapshotUnprotectRequest(I &image_ctx,
                                                       const cls::rbd::SnapshotNamespace &snap_namespace,
 						      const std::string &snap_name)
   : Request<I>(image_ctx, on_finish), m_snap_namespace(snap_namespace),
-    m_snap_name(snap_name), m_ret_val(0), m_snap_id(CEPH_NOSNAP) {
+    m_snap_name(snap_name), m_state(STATE_UNPROTECT_SNAP_START),
+    m_ret_val(0), m_snap_id(CEPH_NOSNAP) {
 }
 
 template <typename I>
@@ -229,8 +230,6 @@ void SnapshotUnprotectRequest<I>::send_unprotect_snap_start() {
   CephContext *cct = image_ctx.cct;
   ldout(cct, 5) << this << " " << __func__ << dendl;
 
-  m_state = STATE_UNPROTECT_SNAP_START;
-
   int r = verify_and_send_unprotect_snap_start();
   if (r < 0) {
     this->async_complete(r);

diff --git a/src/test/rbd_mirror/test_mock_ImageSync.cc b/src/test/rbd_mirror/test_mock_ImageSync.cc
@@ -92,7 +92,7 @@ template <>
 class MetadataCopyRequest<librbd::MockTestImageCtx> {
 public:
   static MetadataCopyRequest* s_instance;
-  Context *on_finish;
+  Context *on_finish{nullptr};
 
   static MetadataCopyRequest* create(librbd::MockTestImageCtx *local_image_ctx,
                                      librbd::MockTestImageCtx *remote_image_ctx,