From: Sage Weil <sage@newdream.net>
Date: Wed, 10 Aug 2011 17:45:52 +0000 (-0700)
Subject: osd: don't try to remove head if it doesn't exist
X-Git-Tag: v0.34~121
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2a5467d98599191c3ba897dbdeb467f5cff247d8;p=ceph.git

osd: don't try to remove head if it doesn't exist

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index a53d9318493d..ad91248c346a 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1652,9 +1652,11 @@ int ReplicatedPG::do_osd_ops(OpContext *ctx, vector<OSDOp>& ops,
       break;
     
     case CEPH_OSD_OP_DELETE:
-      if (!obs.exists)
-        result = -ENOENT;
-      _delete_head(ctx);
+      if (!obs.exists) {
+	result = -ENOENT;
+      } else {
+	_delete_head(ctx);
+      }
       break;
 
     case CEPH_OSD_OP_CLONERANGE: