From: Pan Liu <pan.liu@istuary.com>
Date: Mon, 6 Mar 2017 04:35:22 +0000 (+0800)
Subject: os/filestore: use existing variable to assign newsize.
X-Git-Tag: v12.0.1~158^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=cd10b8dc913a1438a4cce55c4ea7853561e98433;p=ceph.git

os/filestore: use existing variable to assign newsize.

Signed-off-by: Pan Liu <liupan1111@gmail.com>
---

diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc
index 0781e2c6955f9..5382a008ecb7a 100644
--- a/src/os/filestore/FileJournal.cc
+++ b/src/os/filestore/FileJournal.cc
@@ -189,9 +189,8 @@ int FileJournal::_open_file(int64_t oldsize, blksize_t blksize,
   }
 
   if (create && (oldsize < conf_journal_sz)) {
-    uint64_t newsize(cct->_conf->osd_journal_size);
-    newsize <<= 20;
-    dout(10) << "_open extending to " << newsize << " bytes" << dendl;
+    uint64_t newsize(conf_journal_sz);
+    dout(10) <<  __func__ << " _open extending to " << newsize << " bytes" << dendl;
     ret = ::ftruncate(fd, newsize);
     if (ret < 0) {
       int err = errno;