From: Sage Weil <sage@redhat.com>
Date: Mon, 1 Feb 2016 15:26:39 +0000 (-0500)
Subject: Merge pull request #7397 from tchaikov/wip-kill-warnings
X-Git-Tag: v10.0.4~97
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1dfc8ef869c148f038496f452a31b2a74bde3e29;p=ceph.git

Merge pull request #7397 from tchaikov/wip-kill-warnings

build: kill warnings

Reviewed-by: Sage Weil <sage@redhat.com>
---

1dfc8ef869c148f038496f452a31b2a74bde3e29
diff --cc src/os/bluestore/BlueStore.h
index 382a896d419,7b297f0ceda..53a1a7528ae
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@@ -434,14 -424,13 +434,13 @@@ public
  
        // preserve wal ordering for this sequencer by taking the lock
        // while still holding the queue lock
 -      i->osr->wal_apply_lock.Lock();
 +      i->osr->wal_apply_lock.lock();
        return i;
      }
-     void _process(TransContext *i, ThreadPool::TPHandle &handle) {
+     void _process(TransContext *i, ThreadPool::TPHandle &) override {
        store->_wal_apply(i);
 -      i->osr->wal_apply_lock.Unlock();
 +      i->osr->wal_apply_lock.unlock();
      }
-     using ThreadPool::WorkQueue<TransContext>::_process;
      void _clear() {
        assert(wal_queue.empty());
      }