]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: fix incorrect log message for nobarrier mount option
authorKyoji Ogasawara <sawara04.o@gmail.com>
Tue, 22 Jul 2025 15:38:37 +0000 (00:38 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:30:56 +0000 (16:30 +0200)
commit edf842abe4368ce3c423343cf4b23b210fcf1622 upstream.

Fix a wrong log message that appears when the "nobarrier" mount option
is unset.  When "nobarrier" is unset, barrier is actually enabled.
However, the log incorrectly stated "turning off barriers".

Fixes: eddb1a433f26 ("btrfs: add reconfigure callback for fs_context")
CC: stable@vger.kernel.org # 6.12+
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Kyoji Ogasawara <sawara04.o@gmail.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/super.c

index 6119a06b0569386926809b6227380a66664a6c14..61d2ebdd01caf04c2cc1704054ed6d892af3bcf4 100644 (file)
@@ -1461,7 +1461,7 @@ static void btrfs_emit_options(struct btrfs_fs_info *info,
        btrfs_info_if_unset(info, old, NODATACOW, "setting datacow");
        btrfs_info_if_unset(info, old, SSD, "not using ssd optimizations");
        btrfs_info_if_unset(info, old, SSD_SPREAD, "not using spread ssd allocation scheme");
-       btrfs_info_if_unset(info, old, NOBARRIER, "turning off barriers");
+       btrfs_info_if_unset(info, old, NOBARRIER, "turning on barriers");
        btrfs_info_if_unset(info, old, NOTREELOG, "enabling tree log");
        btrfs_info_if_unset(info, old, SPACE_CACHE, "disabling disk space caching");
        btrfs_info_if_unset(info, old, FREE_SPACE_TREE, "disabling free space tree");