mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: buffer: do not use unnecessary atomic operations when discarding buffers

Browse source 
Discarding buffers uses a bunch of atomic operations when discarding
buffers because ......  I can't think of a reason.  Use a cmpxchg loop to
clear all the necessary flags.  In most (all?) cases this will be a single
atomic operations.

[akpm@linux-foundation.org: move BUFFER_FLAGS_DISCARD into the .c file]
Signed-off-by: Mel Gorman <mgorman@suse.de>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Jan Kara <jack@suse.cz>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mel Gorman 2014-06-04 16:10:29 -07:00 committed by Linus Torvalds
parent 6fb81a17d2
commit e7470ee89f
1 changed files with 16 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

21
fs/buffer.c
View file

@ -1483,16 +1483,27 @@ EXPORT_SYMBOL(set_bh_page);
/* /*
* Called when truncating a buffer on a page completely. * Called when truncating a buffer on a page completely.
*/ */
/* Bits that are cleared during an invalidate */
#define BUFFER_FLAGS_DISCARD \
(1 << BH_Mapped | 1 << BH_New | 1 << BH_Req | \
1 << BH_Delay | 1 << BH_Unwritten)
static void discard_buffer(struct buffer_head * bh) static void discard_buffer(struct buffer_head * bh)
{ {
unsigned long b_state, b_state_old;
lock_buffer(bh); lock_buffer(bh);
clear_buffer_dirty(bh); clear_buffer_dirty(bh);
bh->b_bdev = NULL; bh->b_bdev = NULL;
clear_buffer_mapped(bh); b_state = bh->b_state;
clear_buffer_req(bh); for (;;) {
clear_buffer_new(bh); b_state_old = cmpxchg(&bh->b_state, b_state,
clear_buffer_delay(bh); (b_state & ~BUFFER_FLAGS_DISCARD));
clear_buffer_unwritten(bh); if (b_state_old == b_state)
break;
b_state = b_state_old;
}
unlock_buffer(bh); unlock_buffer(bh);
} }