From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 3C0E11FF37F for ; Thu, 18 Apr 2024 10:37:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4327117230; Thu, 18 Apr 2024 10:37:22 +0200 (CEST) Date: Thu, 18 Apr 2024 10:36:45 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox VE development discussion References: <20240417143553.150941-1-f.schauer@proxmox.com> In-Reply-To: <20240417143553.150941-1-f.schauer@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1713428893.aye78e3u51.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL -0.195 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 Subject: Re: [pve-devel] [PATCH v3 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" On April 17, 2024 4:35 pm, Filip Schauer wrote: > 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 > > Signed-off-by: Filip Schauer > --- > Changes since v3: > * Simplify ext4 detection > * Do not add noacl if $acl is undefined > > src/PVE/LXC.pm | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm > index e688ea6..394ffb8 100644 > --- a/src/PVE/LXC.pm > +++ b/src/PVE/LXC.pm > @@ -1825,8 +1825,20 @@ sub __mountpoint_mount { > } > > my $acl = $mountpoint->{acl}; > - if (defined($acl)) { > - push @$optlist, ($acl ? 'acl' : 'noacl'); > + > + if ($acl) { > + push @$optlist, 'acl'; > + } elsif (defined($acl)) { > + my $noacl = 1; > + > + if ($storage) { > + my (undef, undef, undef, undef, undef, undef, $format) = > + PVE::Storage::parse_volname($storage_cfg, $volid); now we call this twice :-/ could we maybe just move this part into the if below, where we already know about the format? here we could push 'noacl' if $acl is defined but false, and $storage is undef and then below in the `if ($storage) {` branch once we have the format, we can push '-o noacl' to @extra_opts if $acl is defined but false, and $format is not 'raw'? makes the patch smaller as well I'd say ;) > + > + $noacl = 0 if $format eq 'raw'; > + } > + > + push @$optlist, 'noacl' if $noacl; > } > > my $optstring = join(',', @$optlist); > -- > 2.39.2 > > > > _______________________________________________ > pve-devel mailing list > pve-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel > > > _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel