From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 883C61FF2C8 for ; Wed, 17 Jul 2024 11:42:45 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2EA363882E; Wed, 17 Jul 2024 11:42:44 +0200 (CEST) From: Max Carrara To: pve-devel@lists.proxmox.com Date: Wed, 17 Jul 2024 11:40:17 +0200 Message-Id: <20240717094034.124857-20-m.carrara@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240717094034.124857-1-m.carrara@proxmox.com> References: <20240717094034.124857-1-m.carrara@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC pve-storage 19/36] plugin: cifs: remove dependency on directory plugin X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" As with the BTRFS plugin, the dependency on the directory plugin is removed by using the helpers from the `Common` module instead of calling the dir plugin's methods. Deprecation warnings for the `get_volume_notes` and `update_volume_notes` methods are also added. Signed-off-by: Max Carrara --- src/PVE/Storage/CIFSPlugin.pm | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/src/PVE/Storage/CIFSPlugin.pm b/src/PVE/Storage/CIFSPlugin.pm index 18dc017..ae51be8 100644 --- a/src/PVE/Storage/CIFSPlugin.pm +++ b/src/PVE/Storage/CIFSPlugin.pm @@ -6,6 +6,13 @@ use Net::IP; use PVE::Tools qw(run_command); use PVE::ProcFSTools; use File::Path; +use PVE::Storage::Common qw( + get_deprecation_warning + storage_dir_get_volume_notes + storage_dir_update_volume_notes + storage_dir_get_volume_attribute + storage_dir_update_volume_attribute +); use PVE::Storage::Plugin; use PVE::JSONSchema qw(get_standard_option); @@ -295,23 +302,45 @@ sub check_connection { # FIXME remove on the next APIAGE reset. # Deprecated, use get_volume_attribute instead. sub get_volume_notes { - my $class = shift; - PVE::Storage::DirPlugin::get_volume_notes($class, @_); + warn get_deprecation_warning( + "PVE::Storage::Common::storage_dir_get_volume_notes" + ); + + my ($class, $scfg, $storeid, $volname, $timeout) = @_; + + return storage_dir_get_volume_notes( + $class, $scfg, $storeid, $volname, $timeout + ); } # FIXME remove on the next APIAGE reset. # Deprecated, use update_volume_attribute instead. sub update_volume_notes { - my $class = shift; - PVE::Storage::DirPlugin::update_volume_notes($class, @_); + warn get_deprecation_warning( + "PVE::Storage::Common::storage_dir_update_volume_notes" + ); + + my ($class, $scfg, $storeid, $volname, $notes, $timeout) = @_; + + return storage_dir_update_volume_notes( + $class, $scfg, $storeid, $volname, $notes, $timeout + ); } sub get_volume_attribute { - return PVE::Storage::DirPlugin::get_volume_attribute(@_); + my ($class, $scfg, $storeid, $volname, $attribute) = @_; + + return storage_dir_get_volume_attribute( + $class, $scfg, $storeid, $volname, $attribute + ); } sub update_volume_attribute { - return PVE::Storage::DirPlugin::update_volume_attribute(@_); + my ($class, $scfg, $storeid, $volname, $attribute, $value) = @_; + + return storage_dir_update_volume_attribute( + $class, $scfg, $storeid, $volname, $attribute, $value + ); } 1; -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel