diff options
| author | Sage Weil <sage@inktank.com> | 2013-03-01 01:58:02 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-03-01 01:58:02 +0100 |
| commit | 862c761554e9f54dc4cd8defc10c4cd11d3ba75f (patch) | |
| tree | 45870a5e014e15f26accd0e55de91f42e90d6ea3 /src/os | |
| parent | osd: add 'osd debug op order' to track and assert order of client ops (diff) | |
| parent | msgr: drop messages on cons with CLOSED Pipes (diff) | |
| download | ceph-862c761554e9f54dc4cd8defc10c4cd11d3ba75f.tar.xz ceph-862c761554e9f54dc4cd8defc10c4cd11d3ba75f.zip | |
Merge branch 'next'
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/FileJournal.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index 50bbb95190e..0056f1f23b4 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -1591,6 +1591,8 @@ void FileJournal::wrap_read_bl(off64_t& pos, int64_t olen, bufferlist& bl) pos += len; olen -= len; } + if (pos >= header.max_size) + pos = pos + get_top() - header.max_size; } bool FileJournal::read_entry(bufferlist& bl, uint64_t& seq) |