diff options
| -rw-r--r-- | src/osdc/ObjectCacher.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/osdc/ObjectCacher.cc b/src/osdc/ObjectCacher.cc index 8dd9de26cf6..01eeccc03be 100644 --- a/src/osdc/ObjectCacher.cc +++ b/src/osdc/ObjectCacher.cc @@ -114,6 +114,10 @@ void ObjectCacher::Object::try_merge_bh(BufferHead *bh) assert(oc->lock.is_locked()); ldout(oc->cct, 10) << "try_merge_bh " << *bh << dendl; + // do not merge rx buffers; last_read_tid may not match + if (bh->is_rx()) + return; + // to the left? map<loff_t,BufferHead*>::iterator p = data.find(bh->start()); assert(p->second == bh); |