mirror of
https://github.com/ceph/ceph
synced 2024-12-18 01:16:55 +00:00
Merge pull request #13742 from liupan1111/wip-cleanup-journal
os/filestore: use existing variable for same func. Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
commit
a07452d9d0
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user