[pve-devel] [PATCH storage 2/2] rbd: merge rbd_cmd and build_cmd helpers

["Fabian Grünbichler" <f.gruenbichler@proxmox.com>]

since the former was just a wrapper around the latter, and the only call
site..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 src/PVE/Storage/RBDPlugin.pm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/PVE/Storage/RBDPlugin.pm b/src/PVE/Storage/RBDPlugin.pm
index 162c016..73bc97e 100644
--- a/src/PVE/Storage/RBDPlugin.pm
+++ b/src/PVE/Storage/RBDPlugin.pm
@@ -84,14 +84,13 @@ my sub get_rbd_dev_path {
     return $pve_path;
 }
 
-my $build_cmd = sub {
-    my ($binary, $scfg, $storeid, $op, @options) = @_;
+my $rbd_cmd = sub {
+    my ($scfg, $storeid, $op, @options) = @_;
 
     my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
     my $pool =  $scfg->{pool} ? $scfg->{pool} : 'rbd';
 
-
-    my $cmd = [$binary];
+    my $cmd = ['/usr/bin/rbd'];
     if ($op eq 'import') {
 	push $cmd->@*, '--dest-pool', $pool;
     } else {
@@ -118,12 +117,6 @@ my $build_cmd = sub {
     return $cmd;
 };
 
-my $rbd_cmd = sub {
-    my ($scfg, $storeid, $op, @options) = @_;
-
-    return $build_cmd->('/usr/bin/rbd', $scfg, $storeid, $op, @options);
-};
-
 # needed for volumes created using ceph jewel (or higher)
 my $krbd_feature_update = sub {
     my ($scfg, $storeid, $name) = @_;
-- 
2.39.5



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel