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 518B894CCD for ; Fri, 23 Feb 2024 11:48:50 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3288116A8C for ; Fri, 23 Feb 2024 11:48:50 +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 ; Fri, 23 Feb 2024 11:48:49 +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 7626844EF8 for ; Fri, 23 Feb 2024 11:48:49 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Fri, 23 Feb 2024 11:48:43 +0100 Message-Id: <20240223104843.34281-1-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.357 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm] Subject: [pve-devel] [PATCH v2 container] fix #4846: Avoid the outdated noacl mount option on ext4 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: Fri, 23 Feb 2024 10:48:50 -0000 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 --- 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