From: Xinze Chi Date: Wed, 21 Jan 2015 09:10:48 +0000 (+0000) Subject: osd: fix some compile warning X-Git-Tag: v0.93~230^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ce38db16419d203f52507b2f2b64b44a258871b;p=ceph.git osd: fix some compile warning Signed-off-by: Xinze Chi --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 937aee6a75ec..33bc719f1daf 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -212,7 +212,7 @@ OPTION(mon_cache_target_full_warn_ratio, OPT_FLOAT, .66) // position between poo OPTION(mon_osd_full_ratio, OPT_FLOAT, .95) // what % full makes an OSD "full" OPTION(mon_osd_nearfull_ratio, OPT_FLOAT, .85) // what % full makes an OSD near full OPTION(mon_allow_pool_delete, OPT_BOOL, true) // allow pool deletion -OPTION(mon_globalid_prealloc, OPT_INT, 10000) // how many globalids to prealloc +OPTION(mon_globalid_prealloc, OPT_U32, 10000) // how many globalids to prealloc OPTION(mon_osd_report_timeout, OPT_INT, 900) // grace period before declaring unresponsive OSDs dead OPTION(mon_force_standby_active, OPT_BOOL, true) // should mons force standby-replay mds to be active OPTION(mon_warn_on_old_mons, OPT_BOOL, true) // should mons set health to WARN if part of quorum is old? diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc index 6a3cb642b21e..adb36099bae0 100644 --- a/src/msg/simple/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -1875,7 +1875,7 @@ int Pipe::read_message(Message **pm, AuthSessionHandler* auth_handler) ceph_msg_header header; ceph_msg_footer footer; - __u32 header_crc; + __u32 header_crc = 0; if (connection_state->has_feature(CEPH_FEATURE_NOSRCADDR)) { if (tcp_read((char*)&header, sizeof(header)) < 0)