From: Greg Kroah-Hartman Date: Mon, 24 Aug 2020 15:38:31 +0000 (+0200) Subject: drop queue-4.9/jbd2-add-the-missing-unlock_buffer-in-the-error-path-of-jbd2_write_sup... X-Git-Tag: v4.4.234~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9646829f256a02343e388b9e1e23cbfe782a8505;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.9/jbd2-add-the-missing-unlock_buffer-in-the-error-path-of-jbd2_write_superblock.patch --- diff --git a/queue-4.9/jbd2-add-the-missing-unlock_buffer-in-the-error-path-of-jbd2_write_superblock.patch b/queue-4.9/jbd2-add-the-missing-unlock_buffer-in-the-error-path-of-jbd2_write_superblock.patch deleted file mode 100644 index 853ae805d2b..00000000000 --- a/queue-4.9/jbd2-add-the-missing-unlock_buffer-in-the-error-path-of-jbd2_write_superblock.patch +++ /dev/null @@ -1,39 +0,0 @@ -From ef3f5830b859604eda8723c26d90ab23edc027a4 Mon Sep 17 00:00:00 2001 -From: "zhangyi (F)" -Date: Sat, 20 Jun 2020 14:19:48 +0800 -Subject: jbd2: add the missing unlock_buffer() in the error path of jbd2_write_superblock() - -From: zhangyi (F) - -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: zhangyi (F) -Reviewed-by: Ritesh Harjani -Cc: stable@kernel.org -Link: https://lore.kernel.org/r/20200620061948.2049579-1-yi.zhang@huawei.com -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman - ---- - fs/jbd2/journal.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/fs/jbd2/journal.c -+++ b/fs/jbd2/journal.c -@@ -1340,8 +1340,10 @@ static int jbd2_write_superblock(journal - 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)) diff --git a/queue-4.9/series b/queue-4.9/series index 88ea9a52c6f..cc9d5b10e6e 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -12,7 +12,6 @@ romfs-fix-uninitialized-memory-leak-in-romfs_dev_read.patch kernel-relay.c-fix-memleak-on-destroy-relay-channel.patch mm-include-cma-pages-in-lowmem_reserve-at-boot.patch mm-page_alloc-fix-core-hung-in-free_pcppages_bulk.patch -jbd2-add-the-missing-unlock_buffer-in-the-error-path-of-jbd2_write_superblock.patch ext4-clean-up-ext4_match-and-callers.patch ext4-fix-checking-of-directory-entry-validity-for-in.patch scsi-ufs-add-delay_before_lpm-quirk-for-micron-devic.patch