Merge pull request #12035 from VictorDenisov/fix_snap_remove

rbd: use snap_remove implementation from internal Reviewed-by: Jason Dillaman <dillaman@redhat.com>
ceph · Nov 21, 2016 · 9369f20 · 9369f20
2 parents cb0fd95 + bf9541a
commit 9369f20
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/librbd/librbd.cc b/src/librbd/librbd.cc
@@ -2377,7 +2377,8 @@ extern "C" int rbd_snap_remove(rbd_image_t image, const char *snap_name)
 {
   librbd::ImageCtx *ictx = (librbd::ImageCtx *)image;
   tracepoint(librbd, snap_remove_enter, ictx, ictx->name.c_str(), ictx->snap_name.c_str(), ictx->read_only, snap_name);
-  int r = ictx->operations->snap_remove(snap_name);
+  librbd::NoOpProgressContext prog_ctx;
+  int r = librbd::snap_remove(ictx, snap_name, 0, prog_ctx);
   tracepoint(librbd, snap_remove_exit, r);
   return r;
 }