From 011b3dde505ae3cd296f31fadde84ff9e9a4e88f Mon Sep 17 00:00:00 2001
From: Kefu Chai <kchai@redhat.com>
Date: Mon, 7 May 2018 14:42:52 +0800
Subject: [PATCH] mds,messages: silence -Wclass-memaccess warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

this change silences warnings like:

warning: ‘void* memset(void*, int, size_t)’ writing to an object of
non-trivial type ‘struct uuid_d’; use assignment instead [-Wcla
ss-memaccess]
   memset(&z.cluster_fsid, 1, sizeof(z.cluster_fsid));
                                                    ^

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 4b99f88fac67d652fe9b7e790236899794ea6c1a)
---
 src/client/Client.cc        | 2 +-
 src/mds/mdstypes.h          | 1 -
 src/messages/MClientQuota.h | 5 +----
 src/osd/osd_types.cc        | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index d87bd1e1bf10c..2a6c5402c7c83 100644
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -13242,7 +13242,7 @@ int Client::ll_delegation(Fh *fh, unsigned cmd, ceph_deleg_cb_t cb, void *priv)
   default:
     try {
       ret = inode->set_deleg(fh, cmd, cb, priv);
-    } catch (std::bad_alloc) {
+    } catch (std::bad_alloc&) {
       ret = -ENOMEM;
     }
     break;
diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h
index 88b8041d56081..aa93b52b65f7c 100644
--- a/src/mds/mdstypes.h
+++ b/src/mds/mdstypes.h
@@ -534,7 +534,6 @@ struct inode_t {
   {
     clear_layout();
     memset(&dir_layout, 0, sizeof(dir_layout));
-    memset(&quota, 0, sizeof(quota));
   }
 
   // file type
diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h
index 08385ca794aea..cc632459f5ab1 100644
--- a/src/messages/MClientQuota.h
+++ b/src/messages/MClientQuota.h
@@ -11,10 +11,7 @@ struct MClientQuota : public Message {
   MClientQuota() :
     Message(CEPH_MSG_CLIENT_QUOTA),
     ino(0)
-  {
-    memset(&rstat, 0, sizeof(rstat));
-    memset(&quota, 0, sizeof(quota));
-  }
+  {}
 private:
   ~MClientQuota() override {}
 
diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index ea9522971f086..6a0dd549c60b5 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -4707,8 +4707,8 @@ void OSDSuperblock::generate_test_instances(list<OSDSuperblock*>& o)
 {
   OSDSuperblock z;
   o.push_back(new OSDSuperblock(z));
-  memset(&z.cluster_fsid, 1, sizeof(z.cluster_fsid));
-  memset(&z.osd_fsid, 2, sizeof(z.osd_fsid));
+  z.cluster_fsid.parse("01010101-0101-0101-0101-010101010101");
+  z.osd_fsid.parse("02020202-0202-0202-0202-020202020202");
   z.whoami = 3;
   z.current_epoch = 4;
   z.oldest_map = 5;
-- 
2.39.5