From 97386dbccea9864875b902321248dae72b6f8a2e Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Thu, 6 Oct 2016 16:59:31 +0800 Subject: [PATCH] os/bluestore: simplify bluestore_gc_merge_data checking Signed-off-by: xie xingguo --- src/os/bluestore/BlueStore.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index 6f68436181e49..6cb463fb2c9b8 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -7900,7 +7900,7 @@ int BlueStore::_do_write( size_t read_len = offset - gc_start_offset; int r = _do_read(c.get(), o, gc_start_offset, read_len, head_bl, 0); assert(r == (int)read_len); - if (g_conf->bluestore_gc_merge_data == true) { + if (g_conf->bluestore_gc_merge_data) { head_bl.claim_append(bl); bl.swap(head_bl); offset = gc_start_offset; @@ -7917,7 +7917,7 @@ int BlueStore::_do_write( size_t read_len = gc_end_offset - end; int r = _do_read(c.get(), o, end, read_len, tail_bl, 0); assert(r == (int)read_len); - if (g_conf->bluestore_gc_merge_data == true) { + if (g_conf->bluestore_gc_merge_data) { bl.claim_append(tail_bl); length += read_len; end += read_len; -- 2.39.5