nilfs2: do not use async write flag for segment summary buffers (6fb7a61e) · Commits · 戴 / test

The async write flag is introduced to nilfs2 in the commit ("nilfs2: fix issue with race condition of competition between segments for dirty blocks"), but the flag only makes sense for data buffers and btree node buffers. It is not needed for segment summary buffers. This gets rid of the latter uses as part of refactoring of atomic bit operations on buffer state bitmap. Signed-off-by:

Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp> Cc: Vyacheslav Dubeyko <slava@dubeyko.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/nilfs2/segment.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -1588,7 +1588,6 @@ static void nilfs_segctor_prepare_write(struct nilfs_sc_info *sci)

		list_for_each_entry(bh, &segbuf->sb_segsum_buffers,
		b_assoc_buffers) {
		set_buffer_async_write(bh);
		if (bh->b_page != bd_page) {
		if (bd_page) {
		lock_page(bd_page);
		@@ -1688,7 +1687,6 @@ static void nilfs_abort_logs(struct list_head *logs, int err)
		list_for_each_entry(segbuf, logs, sb_list) {
		list_for_each_entry(bh, &segbuf->sb_segsum_buffers,
		b_assoc_buffers) {
		clear_buffer_async_write(bh);
		if (bh->b_page != bd_page) {
		if (bd_page)
		end_page_writeback(bd_page);
		@@ -1768,7 +1766,6 @@ static void nilfs_segctor_complete_write(struct nilfs_sc_info *sci)
		b_assoc_buffers) {
		set_buffer_uptodate(bh);
		clear_buffer_dirty(bh);
		clear_buffer_async_write(bh);
		if (bh->b_page != bd_page) {
		if (bd_page)
		end_page_writeback(bd_page);

Admin message