Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "osdc: After write try merge bh." #11262

Merged
merged 1 commit into from Oct 17, 2016
Merged

Revert "osdc: After write try merge bh." #11262

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 0 additions & 9 deletions src/osdc/ObjectCacher.cc
View file
Open in desktop
Expand Up @@ -1114,7 +1114,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid,
}
}

list <BufferHead*> hit;
// apply to bh's!
for (map<loff_t, BufferHead*>::const_iterator p = ob->data_lower_bound(start);
p != ob->data.end();
Expand Down Expand Up @@ -1149,7 +1148,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid,
bh->set_journal_tid(0);
if (bh->get_nocache())
bh_lru_rest.lru_bottouch(bh);
hit.push_back(bh);
ldout(cct, 10) << "bh_write_commit clean " << *bh << dendl;
} else {
mark_dirty(bh);
Expand All @@ -1158,13 +1156,6 @@ void ObjectCacher::bh_write_commit(int64_t poolid, sobject_t oid,
<< dendl;
}
}

for (list<BufferHead*>::iterator bh = hit.begin();
bh != hit.end();
++bh) {
assert(*bh);
ob->try_merge_bh(*bh);
}
}

// update last_commit.
Expand Down