From 5b2ce732d64e3d94ae01a56cc6f87291bc1a1226 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 6 Jun 2016 16:46:09 -0400 Subject: [PATCH] os/bluestore: remove unused ext_offset region_t field Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 2 +- src/os/bluestore/BlueStore.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 7ec94cecbd25c..35cdedf114130 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -3230,7 +3230,7 @@ int BlueStore::_do_read( l2read = MIN(l, lext->second.length - r_off); if (!ready_intervals_in_cache.contains( off, l2read)) { regions2read_t& regions = blobs2read[bptr]; - regions.push_back(region_t(off, r_off + lext->second.offset, 0, l2read)); + regions.push_back(region_t(off, r_off + lext->second.offset, l2read)); } ++lext; } else if (off >= lext->first + lext->second.length) { diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 1b58ff528a11a..f1d840a653f42 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -85,18 +85,15 @@ public: struct region_t { uint64_t logical_offset; uint64_t blob_xoffset; //region offset within the blob - uint64_t ext_xoffset; //region offset within the pextent uint64_t length; - region_t(uint64_t offset, uint64_t b_offs, uint64_t x_offs, uint32_t len) + region_t(uint64_t offset, uint64_t b_offs, uint32_t len) : logical_offset(offset), blob_xoffset(b_offs), - ext_xoffset(x_offs), length(len) {} region_t(const region_t& from) : logical_offset(from.logical_offset), blob_xoffset(from.blob_xoffset), - ext_xoffset(from.ext_xoffset), length(from.length) {} }; typedef list regions2read_t; -- 2.39.5