All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Zhaolong Zhang <zhangzl2013@126.com>,
	Theodore Ts'o <tytso@mit.edu>, Sasha Levin <sashal@kernel.org>,
	linux-ext4@vger.kernel.org
Subject: [PATCH AUTOSEL 4.4 01/10] ext4: fix bh ref count on error paths
Date: Thu, 25 Mar 2021 07:28:22 -0400	[thread overview]
Message-ID: <20210325112832.1928898-1-sashal@kernel.org> (raw)

From: Zhaolong Zhang <zhangzl2013@126.com>

[ Upstream commit c915fb80eaa6194fa9bd0a4487705cd5b0dda2f1 ]

__ext4_journalled_writepage should drop bhs' ref count on error paths

Signed-off-by: Zhaolong Zhang <zhangzl2013@126.com>
Link: https://lore.kernel.org/r/1614678151-70481-1-git-send-email-zhangzl2013@126.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 fs/ext4/inode.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 881601691bd4..336e5c8f423e 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1825,13 +1825,13 @@ static int __ext4_journalled_writepage(struct page *page,
 	if (!ret)
 		ret = err;
 
-	if (!ext4_has_inline_data(inode))
-		ext4_walk_page_buffers(NULL, page_bufs, 0, len,
-				       NULL, bput_one);
 	ext4_set_inode_state(inode, EXT4_STATE_JDATA);
 out:
 	unlock_page(page);
 out_no_pagelock:
+	if (!inline_data && page_bufs)
+		ext4_walk_page_buffers(NULL, page_bufs, 0, len,
+				       NULL, bput_one);
 	brelse(inode_bh);
 	return ret;
 }
-- 
2.30.1


             reply	other threads:[~2021-03-25 11:35 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-25 11:28 Sasha Levin [this message]
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 02/10] rpc: fix NULL dereference on kmalloc failure Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 03/10] ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10 Sasha Levin
2021-03-25 11:28   ` Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 04/10] ASoC: rt5651: " Sasha Levin
2021-03-25 11:28   ` Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 05/10] ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe Sasha Levin
2021-03-25 11:28   ` Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 06/10] scsi: st: Fix a use after free in st_open() Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 07/10] scsi: qla2xxx: Fix broken #endif placement Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 08/10] staging: comedi: cb_pcidas: fix request_irq() warn Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 09/10] staging: comedi: cb_pcidas64: " Sasha Levin
2021-03-25 11:28 ` [PATCH AUTOSEL 4.4 10/10] ext4: do not iput inode under running transaction in ext4_rename() Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210325112832.1928898-1-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tytso@mit.edu \
    --cc=zhangzl2013@126.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.