Skip to content

Commit d760dc5

Browse files
ubizjakakpm00
authored andcommitted
fs/ext4: use try_cmpxchg in ext4_update_bh_state
Use try_cmpxchg instead of cmpxchg (*ptr, old, new) == old in ext4_update_bh_state. x86 CMPXCHG instruction returns success in ZF flag, so this change saves a compare after cmpxchg (and related move instruction in front of cmpxchg). Also, try_cmpxchg implicitly assigns old *ptr value to "old" when cmpxchg fails. There is no need to re-read the value in the loop. No functional change intended. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Uros Bizjak <[email protected]> Cc: "Theodore Ts'o" <[email protected]> Cc: Andreas Dilger <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 4ff3437 commit d760dc5

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

fs/ext4/inode.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -786,11 +786,10 @@ static void ext4_update_bh_state(struct buffer_head *bh, unsigned long flags)
786786
* once we get rid of using bh as a container for mapping information
787787
* to pass to / from get_block functions, this can go away.
788788
*/
789+
old_state = READ_ONCE(bh->b_state);
789790
do {
790-
old_state = READ_ONCE(bh->b_state);
791791
new_state = (old_state & ~EXT4_MAP_FLAGS) | flags;
792-
} while (unlikely(
793-
cmpxchg(&bh->b_state, old_state, new_state) != old_state));
792+
} while (unlikely(!try_cmpxchg(&bh->b_state, &old_state, new_state)));
794793
}
795794

796795
static int _ext4_get_block(struct inode *inode, sector_t iblock,

0 commit comments

Comments
 (0)