]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
btrfs: remove pointless barrier from btrfs_sync_file()
authorFilipe Manana <fdmanana@suse.com>
Wed, 4 Oct 2023 10:38:52 +0000 (11:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Thu, 12 Oct 2023 14:44:18 +0000 (16:44 +0200)
The memory barrier (smp_mb()) at btrfs_sync_file() is completely redundant
now that fs_info->last_trans_committed is read using READ_ONCE(), with the
helper btrfs_get_last_trans_committed(), and written using WRITE_ONCE()
with the helper btrfs_set_last_trans_committed().

This barrier was introduced in 2011, by commit a4abeea41adf ("Btrfs: kill
trans_mutex"), but even back then it was not correct since the writer side
(in btrfs_commit_transaction()), did not issue a pairing memory barrier
after it updated fs_info->last_trans_committed.

So remove this barrier.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/file.c

index 92e6f224bff979d3ed78b367dd51aa415f5eb144..92419cb8508ae4f88358afabd5badb1c664a5c80 100644 (file)
@@ -1889,7 +1889,6 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 
        atomic_inc(&root->log_batch);
 
-       smp_mb();
        if (skip_inode_logging(&ctx)) {
                /*
                 * We've had everything committed since the last time we were