From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 11 May 2011 04:35:50 +0000 (-0700)
Subject: journaler: tolerate ENOENT when prezeroing
X-Git-Tag: v0.28.2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7330c3c473aa128b1e3ecb8752278f655bc79620;p=ceph.git

journaler: tolerate ENOENT when prezeroing

ENOENT is okay and expected.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

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;