From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 23 Dec 2015 18:26:39 +0000 (-0500)
Subject: librbd: properly handle replay of snap remove RPC message
X-Git-Tag: v9.2.1~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F7079%2Fhead;p=ceph.git

librbd: properly handle replay of snap remove RPC message

Fixes: #14164
Backport: infernalis
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit bc309d9d7612f005a3d50ecf099ddf9b706a1bf6)
---

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 1eaa50f81f3b..8bbdfc762019 100644
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -719,7 +719,7 @@ int invoke_async_request(ImageCtx *ictx, const std::string& request_type,
                                            snap_name),
                                boost::bind(&ImageWatcher::notify_snap_remove,
                                            ictx->image_watcher, snap_name));
-      if (r < 0 && r != -EEXIST) {
+      if (r < 0 && r != -ENOENT) {
         return r;
       }
     } else {