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

Commit 5d5e8156 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by Linus Torvalds
Browse files

[PATCH] reiserfs: skip commit on io error 



This should have been part of the original io error patch, but got
dropped somewhere along the way.

It's extremely important when handling the i/o error in the journal to
not commit the transaction with corrupt data.  This patch adds that code
back in.

Signed-off-by: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ea54c96c

fs/reiserfs/journal.c

+14 −4
Original line number Diff line number Diff line
@@ -1039,6 +1039,10 @@ static int flush_commit_list(struct super_block *s, 
	}

	atomic_dec(&journal->j_async_throttle);



	/* We're skipping the commit if there's an error */

	if (retval || reiserfs_is_journal_aborted(journal))

		barrier = 0;



	/* wait on everything written so far before writing the commit

	 * if we are in barrier mode, send the commit down now

	 */
@@ -1077,10 +1081,16 @@ static int flush_commit_list(struct super_block *s, 
	BUG_ON(atomic_read(&(jl->j_commit_left)) != 1);



	if (!barrier) {

		/* If there was a write error in the journal - we can't commit

		 * this transaction - it will be invalid and, if successful,

		 * will just end up propogating the write error out to

		 * the file system. */

		if (likely(!retval && !reiserfs_is_journal_aborted (journal))) {

			if (buffer_dirty(jl->j_commit_bh))

				BUG();

			mark_buffer_dirty(jl->j_commit_bh) ;

			sync_dirty_buffer(jl->j_commit_bh) ;

		}

	} else

		wait_on_buffer(jl->j_commit_bh);