From: Jason Dillaman <dillaman@redhat.com>
Date: Fri, 6 Dec 2019 15:22:22 +0000 (-0500)
Subject: Merge pull request #31589 from zhengchengyao/mv_snapshot
X-Git-Tag: v15.1.0~630
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4cce6e9ee3d1713c5113e0238d7d4e24b6083cea;p=ceph.git

Merge pull request #31589 from zhengchengyao/mv_snapshot

librbd:move all snapshot API functions in internal.cc over to api/Snapshot.cc

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
---

4cce6e9ee3d1713c5113e0238d7d4e24b6083cea
diff --cc src/librbd/librbd.cc
index fdd7c17d99e5,cd4738b8b676..0b8db4ff8b79
--- a/src/librbd/librbd.cc
+++ b/src/librbd/librbd.cc
@@@ -5152,10 -5148,9 +5152,10 @@@ extern "C" int rbd_snap_list(rbd_image_
      tracepoint(librbd, snap_list_exit, -EINVAL, 0);
      return -EINVAL;
    }
 +  // FIPS zeroization audit 20191117: this memset is not security related.
    memset(snaps, 0, sizeof(*snaps) * *max_snaps);
  
-   int r = librbd::snap_list(ictx, cpp_snaps);
+   int r = librbd::api::Snapshot<>::list(ictx, cpp_snaps);
    if (r == -ENOENT) {
      tracepoint(librbd, snap_list_exit, 0, *max_snaps);
      return 0;