]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
reiserfs: Fix locking BUG during mount failure
authorJeff Mahoney <jeffm@jeffreymahoney.com>
Mon, 29 Mar 2010 19:12:39 +0000 (15:12 -0400)
committerFrederic Weisbecker <fweisbec@gmail.com>
Tue, 30 Mar 2010 20:13:09 +0000 (22:13 +0200)
commitb7b7fa43103a9fb30dbcc60cbd5161fdfc25f904
tree8d384f813009478e24ff41505dd2d96ef60c8e52
parent2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6
reiserfs: Fix locking BUG during mount failure

Commit 8ebc423238341b52912c7295b045a32477b33f09 (reiserfs: kill-the-BKL)
introduced a bug in the mount failure case.

The error label releases the lock before calling journal_release_error,
but it requires that the lock be held. do_journal_release unlocks and
retakes it. When it releases it without it held, we trigger a BUG().

The error_alloc label skips the unlock since the lock isn't held yet
but none of the other conditions that are clean up exist yet either.

This patch returns immediately after the kzalloc failure and moves
the reiserfs_write_unlock after the journal_release_error call.

This was reported in https://bugzilla.novell.com/show_bug.cgi?id=591807

Reported-by: Thomas Siedentopf <thomas.siedentopf@novell.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Cc: Thomas Siedentopf <thomas.siedentopf@novell.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: 2.6.33.x <stable@kernel.org>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
fs/reiserfs/super.c