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

Commit 3d4492f8 authored by Chris Mason's avatar Chris Mason Committed by Linus Torvalds
Browse files

[PATCH] reiserfs: reiserfs write_ordered_buffers should not oops on dirty non-uptodate bh 



write_ordered_buffers should handle dirty non-uptodate buffers without a
BUG()

Signed-off-by: default avatarChris Mason <mason@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e0e851cf

fs/reiserfs/journal.c

+13 −2
Original line number Diff line number Diff line
@@ -846,6 +846,14 @@ static int write_ordered_buffers(spinlock_t * lock, 
			spin_lock(lock);

			goto loop_next;

		}

		/* in theory, dirty non-uptodate buffers should never get here,

		 * but the upper layer io error paths still have a few quirks.

		 * Handle them here as gracefully as we can

		 */

		if (!buffer_uptodate(bh) && buffer_dirty(bh)) {

			clear_buffer_dirty(bh);

			ret = -EIO;

		}

		if (buffer_dirty(bh)) {

			list_del_init(&jh->list);

			list_add(&jh->list, &tmp);
@@ -1030,9 +1038,12 @@ static int flush_commit_list(struct super_block *s, 
	}



	if (!list_empty(&jl->j_bh_list)) {

		int ret;

		unlock_kernel();

		write_ordered_buffers(&journal->j_dirty_buffers_lock,

		ret = write_ordered_buffers(&journal->j_dirty_buffers_lock,

					    journal, jl, &jl->j_bh_list);

		if (ret < 0 && retval == 0)

			retval = ret;

		lock_kernel();

	}

	BUG_ON(!list_empty(&jl->j_bh_list));