Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53778ffd authored by Jan Kara's avatar Jan Kara Committed by Linus Torvalds
Browse files

[PATCH] Change ll_rw_block() calls in Reiser 



We need to be sure that current data in buffer are sent to disk.  Hence we
need to call ll_rw_block() with SWRITE.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 26707699

fs/reiserfs/journal.c

+2 −2
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ static int flush_commit_list(struct super_block *s, 
		    SB_ONDISK_JOURNAL_SIZE(s);

		tbh = journal_find_get_block(s, bn);

		if (buffer_dirty(tbh))	/* redundant, ll_rw_block() checks */

			ll_rw_block(WRITE, 1, &tbh);

			ll_rw_block(SWRITE, 1, &tbh);

		put_bh(tbh);

	}

	atomic_dec(&journal->j_async_throttle);
@@ -2172,7 +2172,7 @@ static int journal_read_transaction(struct super_block *p_s_sb, 
	/* flush out the real blocks */

	for (i = 0; i < get_desc_trans_len(desc); i++) {

		set_buffer_dirty(real_blocks[i]);

		ll_rw_block(WRITE, 1, real_blocks + i);

		ll_rw_block(SWRITE, 1, real_blocks + i);

	}

	for (i = 0; i < get_desc_trans_len(desc); i++) {

		wait_on_buffer(real_blocks[i]);