From 7dfb9b230c3472dbe9a88acf55ecfb046af2ccfe Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Tue, 31 Jan 2017 17:07:39 +0500 Subject: [PATCH] Clean issues detected by cppcheck [src/mds/MDLog.cc:1172] -> [src/mds/MDLog.cc:1173]: (warning) Either the condition 'sle!=NULL' is redundant or there is possible null pointer dereference: sle. [src/mon/MDSMonitor.cc:2622] -> [src/mon/MDSMonitor.cc:2625]: (warning) Either the condition 'mds_map!=nullptr' is redundant or there is possible null pointer dereference: mds_map. Signed-off-by: Ilya Shipitsin --- src/mds/MDLog.cc | 2 +- src/mon/MDSMonitor.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 4bc77b58ed85..e3d5ab724ef5 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -1168,9 +1168,9 @@ void MDLog::_reformat_journal(JournalPointer const &jp_in, Journaler *old_journa if (le->get_type() == EVENT_SUBTREEMAP || le->get_type() == EVENT_SUBTREEMAP_TEST) { ESubtreeMap *sle = dynamic_cast(le); + assert(sle != NULL); dout(20) << __func__ << " zeroing expire_pos in subtreemap event at " << le_pos << " seq=" << sle->event_seq << dendl; - assert(sle != NULL); sle->expire_pos = 0; modified = true; } diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index c26e1ce8c166..1fcc58546878 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -2618,11 +2618,11 @@ void MDSMonitor::check_sub(Subscription *sub) mds_map = &(fsmap.filesystems.at(fscid)->mds_map); } + assert(mds_map != nullptr); dout(10) << __func__ << " selected MDS map epoch " << mds_map->epoch << " for namespace " << fscid << " for subscriber " << sub->session->inst.name << " who wants epoch " << sub->next << dendl; - assert(mds_map != nullptr); if (sub->next > mds_map->epoch) { return; } -- 2.47.3