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

Commit 402ff143 authored by zhangyi (F)'s avatar zhangyi (F) Committed by Greg Kroah-Hartman
Browse files

jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock() 



commit ef3f5830b859604eda8723c26d90ab23edc027a4 upstream.

jbd2_write_superblock() is under the buffer lock of journal superblock
before ending that superblock write, so add a missing unlock_buffer() in
in the error path before submitting buffer.

Fixes: 742b06b5628f ("jbd2: check superblock mapped prior to committing")
Signed-off-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: default avatarRitesh Harjani <riteshh@linux.ibm.com>
Cc: stable@kernel.org
Link: https://lore.kernel.org/r/20200620061948.2049579-1-yi.zhang@huawei.com


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5d3f789

fs/jbd2/journal.c

+3 −1
Original line number Diff line number Diff line
@@ -1370,8 +1370,10 @@ static int jbd2_write_superblock(journal_t *journal, int write_flags) 
	int ret;



	/* Buffer got discarded which means block device got invalidated */

	if (!buffer_mapped(bh))

	if (!buffer_mapped(bh)) {

		unlock_buffer(bh);

		return -EIO;

	}



	trace_jbd2_write_superblock(journal, write_flags);

	if (!(journal->j_flags & JBD2_BARRIER))