From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Fri, 21 Oct 2011 21:33:30 +0000 (-0700)
Subject: librbd: propagate error from snap_set
X-Git-Tag: v0.38~57^2~3^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=315ab94e96f671a18e58c7f8d76d6f7fa06543be;p=ceph.git

librbd: propagate error from snap_set

Previously rbd_snap_set always returned 0, even when the snapshot did
not exist.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
---

diff --git a/src/librbd.cc b/src/librbd.cc
index 39bc5f2b9286..d5f79ea6c185 100644
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -1191,10 +1191,14 @@ int snap_set(ImageCtx *ictx, const char *snap_name)
     return r;
 
   Mutex::Locker l(ictx->lock);
-  if (snap_name)
-    ictx->snap_set(snap_name);
-  else
+  if (snap_name) {
+    r = ictx->snap_set(snap_name);
+    if (r < 0) {
+      return r;
+    }
+  } else {
     ictx->snap_unset();
+  }
 
   ictx->data_ctx.snap_set_read(ictx->snapid);