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 14439923B1 for ; Tue, 21 Mar 2023 12:12:54 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E555710236 for ; Tue, 21 Mar 2023 12:12:53 +0100 (CET) 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)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Tue, 21 Mar 2023 12:12:53 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E93F345CF1 for ; Tue, 21 Mar 2023 12:12:52 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 21 Mar 2023 12:12:40 +0100 Message-Id: <20230321111240.670720-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.091 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 POISEN_SPAM_PILL_4 0.1 random spam to be learned in bayes 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] [PATCH storage] cifs: use empty string instead of / as default directory 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: Tue, 21 Mar 2023 11:12:54 -0000 this keeps the mount sources consistent with previous versions without this patch there is a small regression, which leads to the storage not being recognized as being mounted on upgrade: * pvestatd in older version mount the storage with out trailing / ``` //cifsstore/ISO on /mnt/pve/cifsstore type cifs... ``` * the cifs_is_mounted helper does not recognize it as being mounted (as the source now has a / in the end) * attempting to mount leads to ``` mount error(16): Device or resource busy ``` noticed after upgrading and having a cifs storage mounted Signed-off-by: Stoiko Ivanov --- PVE/Storage/CIFSPlugin.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PVE/Storage/CIFSPlugin.pm b/PVE/Storage/CIFSPlugin.pm index 6e20f4b..e03226d 100644 --- a/PVE/Storage/CIFSPlugin.pm +++ b/PVE/Storage/CIFSPlugin.pm @@ -17,7 +17,7 @@ sub cifs_is_mounted : prototype($$) { my ($scfg, $mountdata) = @_; my ($mountpoint, $server, $share) = $scfg->@{'path', 'server', 'share'}; - my $subdir = $scfg->{subdir} // "/"; + my $subdir = $scfg->{subdir} // ''; $server = "[$server]" if Net::IP::ip_is_ipv6($server); my $source = "//${server}/$share$subdir"; @@ -70,7 +70,7 @@ sub cifs_mount : prototype($$$$$) { my ($scfg, $storeid, $smbver, $user, $domain) = @_; my ($mountpoint, $server, $share) = $scfg->@{'path', 'server', 'share'}; - my $subdir = $scfg->{subdir} // "/"; + my $subdir = $scfg->{subdir} // ''; $server = "[$server]" if Net::IP::ip_is_ipv6($server); my $source = "//${server}/$share$subdir"; -- 2.30.2