]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #7397 from tchaikov/wip-kill-warnings
authorSage Weil <sage@redhat.com>
Mon, 1 Feb 2016 15:26:39 +0000 (10:26 -0500)
committerSage Weil <sage@redhat.com>
Mon, 1 Feb 2016 15:26:39 +0000 (10:26 -0500)
build: kill warnings

Reviewed-by: Sage Weil <sage@redhat.com>
1  2 
src/os/bluestore/BlueFS.cc
src/os/bluestore/BlueStore.h

Simple merge
index 382a896d419bbaf0b675632c7e4eebbb1cbd8786,7b297f0cedac4434b42c89e437ebe098da036754..53a1a7528aee9c857019b661289503b1478335a3
@@@ -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());
      }