From 2ac597a5a6b29a2a60793f0dfac399f1ab65f165 Mon Sep 17 00:00:00 2001
From: Josh Durgin <josh.durgin@dreamhost.com>
Date: Fri, 28 Jan 2011 11:02:59 -0800
Subject: [PATCH] librbd: use helper to set ImageCtx snapid

---
 src/librbd.cc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/librbd.cc b/src/librbd.cc
index b6a30903e798..d55028224d82 100644
--- a/src/librbd.cc
+++ b/src/librbd.cc
@@ -667,8 +667,6 @@ int librbd::RBDClient::get_snapc(PoolCtx *pp, string& md_oid, const char *snap_n
     ::decode(id, iter);
     ::decode(image_size, iter);
     ::decode(s, iter);
-    if (s.compare(snap_name) == 0)
-      ictx->snapid = id;
     ictx->snapc.snaps.push_back(id);
     ictx->snaps.push_back(id);
     ictx->add_snap(s, id);
@@ -679,8 +677,11 @@ int librbd::RBDClient::get_snapc(PoolCtx *pp, string& md_oid, const char *snap_n
     return -EIO;
   }
 
-  if (!ictx->snapid) {
-    return -ENOENT;
+  if (snap_name) {
+    ictx->set_snap(snap_name);
+    if (!ictx->snapid) {
+      return -ENOENT;
+    }
   }
 
   return 0;
-- 
2.47.3