提交 bdc4ae01 编写于 作者: T Theodore Ts'o 提交者: Yang Yingliang

ext4: treat buffers contining write errors as valid in ext4_sb_bread()

mainline inclusion
from mainline-5.6-rc1
commit cf2834a5
category: bugfix
bugzilla: 51832
CVE: NA
---------------------------

In commit 7963e5ac ("ext4: treat buffers with write errors as
containing valid data") we missed changing ext4_sb_bread() to use
ext4_buffer_uptodate().  So fix this oversight.
Signed-off-by: NTheodore Ts'o <tytso@mit.edu>

Conflicts:
	fs/ext4/super.c
[we include d9befeda("ext4: clear buffer verified flag if read meta
block from disk") first]
Signed-off-by: Nyangerkun <yangerkun@huawei.com>
Reviewed-by: Nzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 1e7250d7
...@@ -161,7 +161,7 @@ ext4_sb_bread(struct super_block *sb, sector_t block, int op_flags) ...@@ -161,7 +161,7 @@ ext4_sb_bread(struct super_block *sb, sector_t block, int op_flags)
if (bh == NULL) if (bh == NULL)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
if (buffer_uptodate(bh)) if (ext4_buffer_uptodate(bh))
return bh; return bh;
clear_buffer_verified(bh); clear_buffer_verified(bh);
ll_rw_block(REQ_OP_READ, REQ_META | op_flags, 1, &bh); ll_rw_block(REQ_OP_READ, REQ_META | op_flags, 1, &bh);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册