From b0cabb78db28afa9612c1d7782f5dade39bfcbee Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 31 May 2016 14:33:55 -0400 Subject: [PATCH] os/bluestore: drop unused _pad_* methods Signed-off-by: Sage Weil --- src/os/bluestore/BlueStore.cc | 76 ----------------------------------- src/os/bluestore/BlueStore.h | 7 ---- 2 files changed, 83 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 527338365edf3..587f9a723a5ba 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -5282,82 +5282,6 @@ void BlueStore::_pad_zeros( *_dout << dendl; } -void BlueStore::_pad_zeros_head( - OnodeRef o, - bufferlist *bl, uint64_t *offset, uint64_t *length, - uint64_t chunk_size) -{ - dout(40) << "before:\n"; - bl->hexdump(*_dout); - *_dout << dendl; - size_t front_pad = *offset % chunk_size; - assert(front_pad); // or we wouldn't have been called - size_t front_copy = MIN(chunk_size - front_pad, *length); - bufferptr z; - if (front_copy + front_pad < chunk_size) - z = buffer::create(front_copy + front_pad); - else - z = buffer::create_page_aligned(chunk_size); - memset(z.c_str(), 0, front_pad); - memcpy(z.c_str() + front_pad, bl->get_contiguous(0, front_copy), front_copy); - bufferlist old, t; - old.swap(*bl); - bl->append(z); - if (front_copy < *length) { - t.substr_of(old, front_copy, *length - front_copy); - bl->claim_append(t); - } - *offset -= front_pad; - *length += front_pad; - dout(20) << __func__ << " pad 0x" << std::hex << front_pad - << " on front, now 0x" << *offset << "~" << *length << std::dec - << dendl; - dout(40) << "after:\n"; - bl->hexdump(*_dout); - *_dout << dendl; -} - -void BlueStore::_pad_zeros_tail( - TransContext *txc, - OnodeRef o, - bufferlist *bl, uint64_t offset, uint64_t *length, - uint64_t chunk_size) -{ - dout(40) << "before:\n"; - bl->hexdump(*_dout); - *_dout << dendl; - - // back - uint64_t end = offset + *length; - unsigned back_copy = end % chunk_size; - assert(back_copy); // or we wouldn't have been called - uint64_t tail_len; - if (back_copy <= *length) { - // we start at or before the block boundary - tail_len = chunk_size; - } else { - // we start partway into the tail block - back_copy = *length; - tail_len = chunk_size - (offset % chunk_size); - } - uint64_t back_pad = tail_len - back_copy; - bufferptr tail(tail_len); - memcpy(tail.c_str(), bl->get_contiguous(*length - back_copy, back_copy), - back_copy); - memset(tail.c_str() + back_copy, 0, back_pad); - bufferlist old; - old.swap(*bl); - bl->substr_of(old, 0, *length - back_copy); - bl->append(tail); - *length += back_pad; - dout(20) << __func__ << " pad 0x" << std::hex << back_pad - << " on back, now 0x" << offset << "~" << *length << std::dec - << dendl; - dout(40) << "after:\n"; - bl->hexdump(*_dout); - *_dout << dendl; -} - bool BlueStore::_can_overlay_write(OnodeRef o, uint64_t length) { return diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index 29f6e50d28fdc..891e40248d539 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -1287,13 +1287,6 @@ private: void _do_read_all_overlays(bluestore_wal_op_t& wo); void _pad_zeros(bufferlist *bl, uint64_t *offset, uint64_t *length, uint64_t chunk_size); - void _pad_zeros_head(OnodeRef o, bufferlist *bl, - uint64_t *offset, uint64_t *length, - uint64_t chunk_size); - void _pad_zeros_tail(TransContext *txc, - OnodeRef o, bufferlist *bl, - uint64_t offset, uint64_t *length, - uint64_t chunk_size); int _do_write(TransContext *txc, CollectionRef &c, OnodeRef o, -- 2.39.5