update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / utilities / persistent_cache / block_cache_tier_metadata.cc

diff --git a/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc b/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc
index bf3839e4f0971af40045d15d600b7d98b105b03f..3382fda31daedeee2311967e9ef1e2d4e7c0b7e2 100644 (file)
--- a/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc
+++ b/ceph/src/rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc
@@ -1,7 +1,7 @@
 //  Copyright (c) 2013, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 #ifndef ROCKSDB_LITE
 
 #include "utilities/persistent_cache/block_cache_tier_metadata.h"
@@ -63,7 +63,8 @@ bool BlockCacheTierMetadata::Lookup(const Slice& key, LBA* lba) {
 BlockInfo* BlockCacheTierMetadata::Remove(const Slice& key) {
   BlockInfo lookup_key(key);
   BlockInfo* binfo = nullptr;
-  bool ok __attribute__((__unused__)) = block_index_.Erase(&lookup_key, &binfo);
+  bool ok __attribute__((__unused__));
+  ok = block_index_.Erase(&lookup_key, &binfo);
   assert(ok);
   return binfo;
 }