From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 24B0388942 for ; Thu, 28 Jul 2022 12:27:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 1BF7228BE for ; Thu, 28 Jul 2022 12:26:34 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 28 Jul 2022 12:26:32 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 804C841C8C for ; Thu, 28 Jul 2022 12:26:32 +0200 (CEST) Message-ID: Date: Thu, 28 Jul 2022 12:26:26 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Content-Language: en-US To: pve-devel@lists.proxmox.com, Stefan Hrdlicka References: <20220513135550.1856651-1-s.hrdlicka@proxmox.com> <20220513135550.1856651-2-s.hrdlicka@proxmox.com> From: Fiona Ebner In-Reply-To: <20220513135550.1856651-2-s.hrdlicka@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.041 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [cifsplugin.pm, nfsplugin.pm, plugin.pm] Subject: Re: [pve-devel] [PATCH storage 1/2] add options parameter to cifs plugin (fixes #2920) 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: , X-List-Received-Date: Thu, 28 Jul 2022 10:27:04 -0000 Please use "fix #2920" as a prefix Am 13.05.22 um 15:55 schrieb Stefan Hrdlicka: > this makes it possible to add all mount options offered by mount.cifs > NFS & CIFS now share the options parameter since the use it for > the same prupose > > Signed-off-by: Stefan Hrdlicka Just style nits :), so you can add Reviewed-by: Fiona Ebner after addressing them. > --- > PVE/Storage/CIFSPlugin.pm | 10 ++++++++-- > PVE/Storage/NFSPlugin.pm | 4 ---- > PVE/Storage/Plugin.pm | 6 ++++++ > 3 files changed, 14 insertions(+), 6 deletions(-) > > diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm > index 982040a..e4ea320 100644 > --- a/PVE/Storage/CIFSPlugin.pm > +++ b/PVE/Storage/CIFSPlugin.pm > @@ -64,7 +64,7 @@ sub get_cred_file { > } > > sub cifs_mount { > - my ($server, $share, $mountpoint, $storeid, $smbver, $user, $domain) = @_; > + my ($server, $share, $mountpoint, $storeid, $smbver, $user, $domain, $options) = @_; > > $server = "[$server]" if Net::IP::ip_is_ipv6($server); > my $source = "//${server}/$share"; > @@ -80,6 +80,10 @@ sub cifs_mount { > > push @$cmd, '-o', defined($smbver) ? "vers=$smbver" : "vers=default"; > > + if ($options) { > + push @$cmd, '-o', $options; > + } Style nit: could be a single line with post-if > + > run_command($cmd, errmsg => "mount error"); > } > > @@ -144,6 +148,7 @@ sub options { > mkdir => { optional => 1 }, > bwlimit => { optional => 1 }, > preallocation => { optional => 1 }, > + options => { optional => 1 }, > }; > } > > @@ -223,6 +228,7 @@ sub activate_storage { > my $path = $scfg->{path}; > my $server = $scfg->{server}; > my $share = $scfg->{share}; > + my $options = $scfg->{options}; Style nit: single-use variable that can be avoided by using $scfg->{options} directly below. > > if (!cifs_is_mounted($server, $share, $path, $cache->{mountdata})) { > > @@ -232,7 +238,7 @@ sub activate_storage { > "directory '$path' does not exist\n" if ! -d $path; > > cifs_mount($server, $share, $path, $storeid, $scfg->{smbversion}, > - $scfg->{username}, $scfg->{domain}); > + $scfg->{username}, $scfg->{domain}, $options); Style nit: already pre-existing problem, but nowadays, we put each argument on a single line once it gets too long. > } > > $class->SUPER::activate_storage($storeid, $scfg, $cache); > diff --git a/PVE/Storage/NFSPlugin.pm b/PVE/Storage/NFSPlugin.pm > index 5bd7313..f777483 100644 > --- a/PVE/Storage/NFSPlugin.pm > +++ b/PVE/Storage/NFSPlugin.pm > @@ -69,10 +69,6 @@ sub properties { > description => "Server IP or DNS name.", > type => 'string', format => 'pve-storage-server', > }, > - options => { > - description => "NFS mount options (see 'man nfs')", > - type => 'string', format => 'pve-storage-options', > - }, > }; > } > > diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm > index 0a100b7..cf65b3c 100644 > --- a/PVE/Storage/Plugin.pm > +++ b/PVE/Storage/Plugin.pm > @@ -180,6 +180,12 @@ my $defaultData = { > default => 'metadata', > optional => 1, > }, > + options => { > + description => "NFS/CIFS mount options (see 'man nfs' " . > + "or 'man mount.cifs')", Style nit: wrong indentation > + type => 'string', format => 'pve-storage-options', > + optional => 1, here as well > + }, > }, > }; >