summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSage Weil <sage.weil@dreamhost.com>2011-05-11 06:35:50 +0200
committerSage Weil <sage@newdream.net>2011-05-24 22:16:21 +0200
commit7330c3c473aa128b1e3ecb8752278f655bc79620 (patch)
tree02da1ed4964bbd539d0058fcd93260bf69332873
parentosd: add ability to explicitly mark unfound as lost (diff)
downloadceph-7330c3c473aa128b1e3ecb8752278f655bc79620.tar.xz
ceph-7330c3c473aa128b1e3ecb8752278f655bc79620.zip
journaler: tolerate ENOENT when prezeroing
ENOENT is okay and expected. Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
-rw-r--r--src/osdc/Journaler.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index c670c00bfc0..003d2bd9ce8 100644
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -646,7 +646,7 @@ void Journaler::_prezeroed(int r, uint64_t start, uint64_t len)
<< ", prezeroing/prezero was " << prezeroing_pos << "/" << prezero_pos
<< ", pending " << pending_zero
<< dendl;
- assert(r == 0);
+ assert(r == 0 || r == -ENOENT);
if (start == prezero_pos) {
prezero_pos += len;