btrfs: use clear_and_wake_up_bit() where open coded

kdave · kdave · commit e8d2e254dc07 · 2025-07-22T00:09:21.000+02:00
There are two cases open coding the clear and wake up pattern, we can
use the helper.

Reviewed-by: Johannes Thumshirn &lt;johannes.thumshirn@wdc.com&gt;
Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
@@ -2060,10 +2060,7 @@ static void end_bbio_meta_write(struct btrfs_bio *bbio)
 	}
 
 	buffer_tree_clear_mark(eb, PAGECACHE_TAG_WRITEBACK);
-	clear_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags);
-	smp_mb__after_atomic();
-	wake_up_bit(&eb->bflags, EXTENT_BUFFER_WRITEBACK);
-
+	clear_and_wake_up_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags);
 	bio_put(&bbio->bio);
 }
 
@@ -3681,9 +3678,7 @@ void set_extent_buffer_uptodate(struct extent_buffer *eb)
 
 static void clear_extent_buffer_reading(struct extent_buffer *eb)
 {
-	clear_bit(EXTENT_BUFFER_READING, &eb->bflags);
-	smp_mb__after_atomic();
-	wake_up_bit(&eb->bflags, EXTENT_BUFFER_READING);
+	clear_and_wake_up_bit(EXTENT_BUFFER_READING, &eb->bflags);
 }
 
 static void end_bbio_meta_read(struct btrfs_bio *bbio)

Original file line number	Diff line number	Diff line change
`@@ -2060,10 +2060,7 @@ static void end_bbio_meta_write(struct btrfs_bio *bbio)`
`2060`	`2060`	`}`
`2061`	`2061`
`2062`	`2062`	`buffer_tree_clear_mark(eb, PAGECACHE_TAG_WRITEBACK);`
`2063`		`- clear_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags);`
`2064`		`- smp_mb__after_atomic();`
`2065`		`- wake_up_bit(&eb->bflags, EXTENT_BUFFER_WRITEBACK);`
`2066`		`-`
	`2063`	`+ clear_and_wake_up_bit(EXTENT_BUFFER_WRITEBACK, &eb->bflags);`
`2067`	`2064`	`bio_put(&bbio->bio);`
`2068`	`2065`	`}`
`2069`	`2066`
`@@ -3681,9 +3678,7 @@ void set_extent_buffer_uptodate(struct extent_buffer *eb)`
`3681`	`3678`
`3682`	`3679`	`static void clear_extent_buffer_reading(struct extent_buffer *eb)`
`3683`	`3680`	`{`
`3684`		`- clear_bit(EXTENT_BUFFER_READING, &eb->bflags);`
`3685`		`- smp_mb__after_atomic();`
`3686`		`- wake_up_bit(&eb->bflags, EXTENT_BUFFER_READING);`
	`3681`	`+ clear_and_wake_up_bit(EXTENT_BUFFER_READING, &eb->bflags);`
`3687`	`3682`	`}`
`3688`	`3683`
`3689`	`3684`	`static void end_bbio_meta_read(struct btrfs_bio *bbio)`