]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cls/rbd: init local var with known value 25588/head
authorKefu Chai <kchai@redhat.com>
Thu, 20 Dec 2018 03:24:28 +0000 (11:24 +0800)
committerKefu Chai <kchai@redhat.com>
Thu, 3 Jan 2019 02:19:02 +0000 (10:19 +0800)
DirectoryState does not have an "invalid" enum so far, since it's
defined using `enum class`, init a value of this type with a known value
could be a better choice even it is always initialized before being read.

this silences the GCC warning of:

src/cls/rbd/cls_rbd.cc:3147:3: warning: ‘on_disk_directory_state’ may be
used uninitialized in this function [-Wmaybe-uninitialized]
   if (directory_state != on_disk_directory_state) {
   ^~

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/cls/rbd/cls_rbd.cc

index 40bb1a05196f1886ed6a904366722d762c54c19e..58f7001a988739dca866932cd3ceb02040c5f03a 100644 (file)
@@ -3130,7 +3130,7 @@ int dir_remove_image(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
  */
 int dir_state_assert(cls_method_context_t hctx, bufferlist *in, bufferlist *out)
 {
-  cls::rbd::DirectoryState directory_state;
+  cls::rbd::DirectoryState directory_state = cls::rbd::DIRECTORY_STATE_READY;
   try {
     auto iter = in->cbegin();
     decode(directory_state, iter);