[pve-devel] [PATCH storage] cifs: use empty string instead of / as default directory

[pve-devel] [PATCH storage] cifs: use empty string instead of / as default directory

[Stoiko Ivanov]

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 <s.ivanov@proxmox.com>
---
 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

[pve-devel] applied: [PATCH storage] cifs: use empty string instead of / as default directory

[Thomas Lamprecht]

Am 21/03/2023 um 12:12 schrieb Stoiko Ivanov:
> 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 <s.ivanov@proxmox.com>
> ---
>  PVE/Storage/CIFSPlugin.pm | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
>

applied, thanks!