]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
os/bluestore: remove unused ext_offset region_t field
authorSage Weil <sage@redhat.com>
Mon, 6 Jun 2016 20:46:09 +0000 (16:46 -0400)
committerSage Weil <sage@redhat.com>
Wed, 15 Jun 2016 19:25:30 +0000 (15:25 -0400)
Signed-off-by: Sage Weil <sage@redhat.com>
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h

index 7ec94cecbd25c29691dc3d52f9f8677238628996..35cdedf114130d1907aab7bfa03b57e9b5c36f50 100644 (file)
@@ -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) {
index 1b58ff528a11afe357cc4f28c09063c829e55371..f1d840a653f4232bb90b6dbee6f1a0fe4586a012 100644 (file)
@@ -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<region_t> regions2read_t;