2020-09-24 07:33:25

by Zhang Yi

Subject: [PATCH v2 4/7] ext4: use ext4_buffer_uptodate() in __ext4_get_inode_loc()

We have already introduced ext4_buffer_uptodate() to re-set the uptodate
bit on buffer which has been failed to write out to disk. Just remove
the redundant codes and switch to use ext4_buffer_uptodate() in
__ext4_get_inode_loc().

Signed-off-by: zhangyi (F) <[email protected]>
---
fs/ext4/inode.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 3661ed126c5f..171df289ef7e 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4287,16 +4287,7 @@ static int __ext4_get_inode_loc(struct inode *inode,
if (!buffer_uptodate(bh)) {
lock_buffer(bh);

- /*
- * If the buffer has the write error flag, we have failed
- * to write out another inode in the same block. In this
- * case, we don't have to read the block because we may
- * read the old inode data successfully.
- */
- if (buffer_write_io_error(bh) && !buffer_uptodate(bh))
- set_buffer_uptodate(bh);
-
- if (buffer_uptodate(bh)) {
+ if (ext4_buffer_uptodate(bh)) {
/* someone brought it uptodate while we waited */
unlock_buffer(bh);
goto has_buffer;
--
2.25.4

2020-10-09 03:52:37

by Theodore Ts'o

Subject: Re: [PATCH v2 4/7] ext4: use ext4_buffer_uptodate() in __ext4_get_inode_loc()

On Thu, Sep 24, 2020 at 03:33:34PM +0800, zhangyi (F) wrote:
> We have already introduced ext4_buffer_uptodate() to re-set the uptodate
> bit on buffer which has been failed to write out to disk. Just remove
> the redundant codes and switch to use ext4_buffer_uptodate() in
> __ext4_get_inode_loc().
>
> Signed-off-by: zhangyi (F) <[email protected]>

Thanks, applied.

- Ted