summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhaolong Zhang <zhangzl2013@126.com>2021-03-02 17:42:31 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-07 12:05:38 +0200
commitadba8b4e36fb35431ee375504dc9b26439045f6a (patch)
tree098263084f38280f1b331d5add47f8c4e6358e10
parent1c503dd09af14ba9885bc1bf2a2cc0371f1f0ae1 (diff)
downloadlinux-stable-adba8b4e36fb35431ee375504dc9b26439045f6a.tar.gz
linux-stable-adba8b4e36fb35431ee375504dc9b26439045f6a.tar.bz2
linux-stable-adba8b4e36fb35431ee375504dc9b26439045f6a.zip
ext4: fix bh ref count on error paths
[ 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>
-rw-r--r--fs/ext4/inode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index aa97a3ed3d8f..79c067f74253 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1978,13 +1978,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;
}