os/bluestore/BlueFS: rename buffered_io option

This is not a bluestore option. Signed-off-by: Sage Weil <sage@redhat.com>
ceph · Aug 18, 2016 · 6af2ed7 · 6af2ed7
1 parent 7f568fa
commit 6af2ed7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/common/config_opts.h b/src/common/config_opts.h
@@ -934,6 +934,7 @@ OPTION(bluefs_log_compact_min_ratio, OPT_FLOAT, 5.0)      // before we consider
 OPTION(bluefs_log_compact_min_size, OPT_U64, 16*1048576)  // before we consider
 OPTION(bluefs_min_flush_size, OPT_U64, 65536)  // ignore flush until its this big
 OPTION(bluefs_compact_log_sync, OPT_BOOL, false)  // sync or async log compaction?
+OPTION(bluefs_buffered_io, OPT_BOOL, false)
 
 OPTION(bluestore_bluefs, OPT_BOOL, true)
 OPTION(bluestore_bluefs_env_mirror, OPT_BOOL, false) // mirror to normal Env for debug
@@ -942,7 +943,6 @@ OPTION(bluestore_bluefs_min_ratio, OPT_FLOAT, .02)  // min fs free / total free
 OPTION(bluestore_bluefs_max_ratio, OPT_FLOAT, .90)  // max fs free / total free
 OPTION(bluestore_bluefs_gift_ratio, OPT_FLOAT, .02) // how much to add at a time
 OPTION(bluestore_bluefs_reclaim_ratio, OPT_FLOAT, .20) // how much to reclaim at a time
-OPTION(bluestore_bluefs_buffered_io, OPT_BOOL, false)
 // If you want to use spdk driver, you need to specify NVMe serial number here
 // with "spdk:" prefix.
 // Users can use 'lspci -vvv -d 8086:0953 | grep "Device Serial Number"' to

diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc
@@ -840,7 +840,7 @@ int BlueFS::_read_random(
              << std::hex << x_off << "~" << l << std::dec
              << " of " << *p << dendl;
     int r = bdev[p->bdev]->read_random(p->offset + x_off, l, out,
-				       g_conf->bluestore_bluefs_buffered_io);
+				       g_conf->bluefs_buffered_io);
     assert(r == 0);
     off += l;
     len -= l;
@@ -901,7 +901,7 @@ int BlueFS::_read(
                << std::hex << x_off << "~" << l << std::dec
                << " of " << *p << dendl;
       int r = bdev[p->bdev]->read(p->offset + x_off, l, &buf->bl, ioc[p->bdev],
-				  g_conf->bluestore_bluefs_buffered_io);
+				  g_conf->bluefs_buffered_io);
       assert(r == 0);
     }
     left = buf->get_buf_remaining(off);
@@ -1474,7 +1474,7 @@ int BlueFS::_flush_range(FileWriter *h, uint64_t offset, uint64_t length)
       t.append_zero(super.block_size - tail);
     }
     bdev[p->bdev]->aio_write(p->offset + x_off, t, h->iocv[p->bdev],
-			     g_conf->bluestore_bluefs_buffered_io);
+			     g_conf->bluefs_buffered_io);
     bloff += x_len;
     length -= x_len;
     ++p;