Merge tag 'powerpc-6.1-5' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-block.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index b927f6981ad10ac3ad0ac1969d71bb0d1db51967..d9c6d1fbb6dde5d6574f63e5b3596e756ee36c5d 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1453,19 +1453,15 @@ EXPORT_SYMBOL(set_bh_page);
 
 static void discard_buffer(struct buffer_head * bh)
 {
-       unsigned long b_state, b_state_old;
+       unsigned long b_state;
 
        lock_buffer(bh);
        clear_buffer_dirty(bh);
        bh->b_bdev = NULL;
-       b_state = bh->b_state;
-       for (;;) {
-               b_state_old = cmpxchg(&bh->b_state, b_state,
-                                     (b_state & ~BUFFER_FLAGS_DISCARD));
-               if (b_state_old == b_state)
-                       break;
-               b_state = b_state_old;
-       }
+       b_state = READ_ONCE(bh->b_state);
+       do {
+       } while (!try_cmpxchg(&bh->b_state, &b_state,
+                             b_state & ~BUFFER_FLAGS_DISCARD));
        unlock_buffer(bh);
 }