Commit 87726c33 authored Nov 26, 2012 by Linus Torvalds

linux-fs

Pull ext3 regression fix from Jan Kara:
 "Fix an ext3 regression introduced during 3.7 merge window.  It leads
  to deadlock if you stress the filesystem in the right way (luckily
  only if blocksize < pagesize)."

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  jbd: Fix lock ordering bug in journal_unmap_buffer()

parents 9489e9dc 25389bb2

fs/jbd/transaction.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -1961,7 +1961,9 @@ static int journal_unmap_buffer(journal_t journal, struct buffer_head bh,
		spin_unlock(&journal->j_list_lock);
		jbd_unlock_bh_state(bh);
		spin_unlock(&journal->j_state_lock);
		unlock_buffer(bh);
		log_wait_commit(journal, tid);
		lock_buffer(bh);
		goto retry;
		}
		/*