From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF20E2E92DA for ; Sun, 26 Oct 2025 14:37:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761489476; cv=none; b=m228GYlDygsXt48IXUBKd9ZhwgcWQTWds1uiaatmFpUJy3dSomM90Nq8HL0rPFytFbJF4xBcrQL8s7sezelq/UdYL6qFOyHt/TNm2CHJlS6yr4fIaGzU9PxZ6xjcGaT1P4CpvX3dG8YWLaL3RzLQJZc6dw5yZ5RbScyu2RpwOWI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761489476; c=relaxed/simple; bh=FvVNW7QH29cw9Re5BgQQ4yZQdOrIkKCZJOiAESqH7zY=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=VmG11+nIFUcfPm9FX+/Dh2oK7rOpQNjfMlKNtDyjqMiehgbJbvF3hh5ddbAkuANzzIUHjeh55kFOaUnPLD9kvpYtGckVHvYrBHqC4vCGsnRBWTP+d4RXFwNdTge/9r8wJ/556bxUURRy0+kyOrQIQJTM8a6C/D9YCjyfDStMNms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mlJA/cIE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mlJA/cIE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65A4EC4CEF1; Sun, 26 Oct 2025 14:37:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761489475; bh=FvVNW7QH29cw9Re5BgQQ4yZQdOrIkKCZJOiAESqH7zY=; h=Subject:To:Cc:From:Date:From; b=mlJA/cIE3Y9bHi4OYMOtgUTFkCZpcJkjjpXlus2+VS2Okt4XigvxVLqomEXHd2o1f xchF4FA1/k55H6LeYUL06qhjx3/Hc/nXB5lF75KRYKwKmvf5y0ZJ/HDcgiDqYray2h luZJVaS9XNiabrIKYUGG4HaACB320CFmQSB+5Je4= Subject: FAILED: patch "[PATCH] xfs: always warn about deprecated mount options" failed to apply to 6.6-stable tree To: djwong@kernel.org,cem@kernel.org,cmaiolino@redhat.com,hch@lst.de Cc: From: Date: Sun, 26 Oct 2025 15:37:45 +0100 Message-ID: <2025102645-pretty-shrewdly-3727@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x 630785bfbe12c3ee3ebccd8b530a98d632b7e39d # git commit -s git send-email --to '' --in-reply-to '2025102645-pretty-shrewdly-3727@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 630785bfbe12c3ee3ebccd8b530a98d632b7e39d Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 21 Oct 2025 11:30:12 -0700 Subject: [PATCH] xfs: always warn about deprecated mount options The deprecation of the 'attr2' mount option in 6.18 wasn't entirely successful because nobody noticed that the kernel never printed a warning about attr2 being set in fstab if the only xfs filesystem is the root fs; the initramfs mounts the root fs with no mount options; and the init scripts only conveyed the fstab options by remounting the root fs. Fix this by making it complain all the time. Cc: stable@vger.kernel.org # v5.13 Fixes: 92cf7d36384b99 ("xfs: Skip repetitive warnings about mount options") Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Reviewed-by: Carlos Maiolino Signed-off-by: Carlos Maiolino diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index 9d51186b24dd..c53f2edf92e7 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c @@ -1379,16 +1379,25 @@ suffix_kstrtoull( static inline void xfs_fs_warn_deprecated( struct fs_context *fc, - struct fs_parameter *param, - uint64_t flag, - bool value) + struct fs_parameter *param) { - /* Don't print the warning if reconfiguring and current mount point - * already had the flag set + /* + * Always warn about someone passing in a deprecated mount option. + * Previously we wouldn't print the warning if we were reconfiguring + * and current mount point already had the flag set, but that was not + * the right thing to do. + * + * Many distributions mount the root filesystem with no options in the + * initramfs and rely on mount -a to remount the root fs with the + * options in fstab. However, the old behavior meant that there would + * never be a warning about deprecated mount options for the root fs in + * /etc/fstab. On a single-fs system, that means no warning at all. + * + * Compounding this problem are distribution scripts that copy + * /proc/mounts to fstab, which means that we can't remove mount + * options unless we're 100% sure they have only ever been advertised + * in /proc/mounts in response to explicitly provided mount options. */ - if ((fc->purpose & FS_CONTEXT_FOR_RECONFIGURE) && - !!(XFS_M(fc->root->d_sb)->m_features & flag) == value) - return; xfs_warn(fc->s_fs_info, "%s mount option is deprecated.", param->key); }