all lists on lists.proxmox.com
 help / color / mirror / Atom feed
* [pve-devel] [PATCH v2 container] fix #4846: Avoid the outdated noacl mount option on ext4
@ 2024-02-23 10:48 Filip Schauer
  2024-04-11 13:44 ` Fabian Grünbichler
  0 siblings, 1 reply; 6+ messages in thread
From: Filip Schauer @ 2024-02-23 10:48 UTC (permalink / raw)
  To: pve-devel

Do not use the 'noacl' mount option when mounting a container disk with
an ext4 file system. The option was removed from the kernel in commit
2d544ec923db

The ext4 detection is based on $do_format in alloc_disk.

Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
---
 src/PVE/LXC.pm | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 7883cfb..6810601 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1835,8 +1835,26 @@ sub __mountpoint_mount {
     }
 
     my $acl = $mountpoint->{acl};
-    if (defined($acl)) {
-	push @$optlist, ($acl ? 'acl' : 'noacl');
+
+    if ($acl) {
+	push @$optlist, 'acl';
+    } else {
+	my $noacl = 1;
+
+	if ($storage) {
+	    my $scfg = PVE::Storage::storage_config($storage_cfg, $storage);
+
+	    # Avoid the outdated 'noacl' mount option on ext4 file systems
+	    if ($scfg->{content}->{rootdir} && $scfg->{path}) {
+		$noacl = ($scfg->{type} eq 'btrfs' && $scfg->{quotas});
+	    } elsif ($scfg->{type} eq 'zfspool') {
+		$noacl = 1;
+	    } elsif ($scfg->{content}->{rootdir}) {
+		$noacl = 0;
+	    }
+	}
+
+	push @$optlist, 'noacl' if $noacl;
     }
 
     my $optstring = join(',', @$optlist);
-- 
2.39.2





^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-04-18  9:22 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-23 10:48 [pve-devel] [PATCH v2 container] fix #4846: Avoid the outdated noacl mount option on ext4 Filip Schauer
2024-04-11 13:44 ` Fabian Grünbichler
2024-04-17 14:38   ` Filip Schauer
2024-04-18  8:17   ` Thomas Lamprecht
2024-04-18  8:48     ` Fabian Grünbichler
2024-04-18  9:22       ` Thomas Lamprecht

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal