librbd: fix rollback size

The duplicate calls to get_image_size() and get_snap_size() replaced
by 5806226cf0743bb44eaf7bc815897c6846d43233 uncovered this. The first
call was using the currently set snap_id instead of the snapshot being
rolled back to.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
(cherry picked from commit d6c126e2131fefab6df676f2b9d0addf78f7a488)

diff --git a/src/librbd/internal.cc b/src/librbd/internal.cc
index 7c90f02b09db91eea57da69b6bbb6da96b407034..6989a70c98ef2639c0f6ceb2ffe1c65562a3eb1c 100644 (file)
--- a/src/librbd/internal.cc
+++ b/src/librbd/internal.cc
@@ -1752,7 +1752,7 @@ reprotect_and_return_err:
        lderr(cct) << "No such snapshot found." << dendl;
        return -ENOENT;
       }
-      new_size = ictx->get_image_size(ictx->snap_id);
+      new_size = ictx->get_image_size(snap_id);
     }
 
     // need to flush any pending writes before resizing and rolling back -