RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 02:27:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8349 from Aran85/prepare_entry_cleanup

Browse Source 
os/filestore: prepare entry cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2016-05-09 08:57:51 -04:00
commit bfa5461265
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/os/filestore/FileJournal.cc
View File

@ -1604,13 +1604,12 @@ void FileJournal::check_aio_completion()
int FileJournal::prepare_entry(vector<ObjectStore::Transaction>& tls, bufferlist* tbl) {
dout(10) << "prepare_entry " << tls << dendl;
unsigned data_len = 0;
int data_len = g_conf->journal_align_min_size - 1;
int data_align = -1; // -1 indicates that we don't care about the alignment
bufferlist bl;
for (vector<ObjectStore::Transaction>::iterator p = tls.begin();
p != tls.end(); ++p) {
if ((*p).get_data_length() > data_len &&
(int)(*p).get_data_length() >= g_conf->journal_align_min_size) {
if ((int)(*p).get_data_length() > data_len) {
data_len = (*p).get_data_length();
data_align = ((*p).get_data_alignment() - bl.length()) & ~CEPH_PAGE_MASK;
}