Merge tag 'mm-nonmm-stable-2023-02-20-15-29' of git://git.kernel.org/pub/scm/linux...

[linux-block.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index f67d0e1bf4e01daca7c6b4f952ddbc313e28e832..40579ef513b716a90729a24ec26c043728a640ae 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -786,11 +786,10 @@ static void ext4_update_bh_state(struct buffer_head *bh, unsigned long flags)
         * once we get rid of using bh as a container for mapping information
         * to pass to / from get_block functions, this can go away.
         */
+       old_state = READ_ONCE(bh->b_state);
        do {
-               old_state = READ_ONCE(bh->b_state);
                new_state = (old_state & ~EXT4_MAP_FLAGS) | flags;
-       } while (unlikely(
-                cmpxchg(&bh->b_state, old_state, new_state) != old_state));
+       } while (unlikely(!try_cmpxchg(&bh->b_state, &old_state, new_state)));
 }
 
 static int _ext4_get_block(struct inode *inode, sector_t iblock,