From: zhengyin <zhengyin@cmss.chinamobile.com>
Date: Thu, 6 Sep 2018 14:54:25 +0000 (-0400)
Subject: rbd: Simplified code and remove do_clear_limit func
X-Git-Tag: v14.0.1~330^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6806615a3f3ad3e2bf058df88c00e47d4d63f889;p=ceph.git

rbd: Simplified code and remove do_clear_limit func

Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
---

diff --git a/src/tools/rbd/action/Snap.cc b/src/tools/rbd/action/Snap.cc
index b08891908d2..2ea93126fce 100644
--- a/src/tools/rbd/action/Snap.cc
+++ b/src/tools/rbd/action/Snap.cc
@@ -270,11 +270,6 @@ int do_set_limit(librbd::Image& image, uint64_t limit)
   return image.snap_set_limit(limit);
 }
 
-int do_clear_limit(librbd::Image& image)
-{
-  return image.snap_set_limit(UINT64_MAX);
-}
-
 void get_list_arguments(po::options_description *positional,
                         po::options_description *options) {
   at::add_image_spec_options(positional, options, at::ARGUMENT_MODIFIER_NONE);
@@ -770,7 +765,7 @@ int execute_clear_limit(const po::variables_map &vm,
       return r;
   }
 
-  r = do_clear_limit(image);
+  r = do_set_limit(image, UINT64_MAX);
   if (r < 0) {
     std::cerr << "rbd: clearing snapshot limit failed: " << cpp_strerror(r)
 	      << std::endl;