From b759debf9a3c0d5baf38aa4575bef80689672b88 Mon Sep 17 00:00:00 2001
From: Ye Bin <yebin10@huawei.com>
Date: Tue, 19 Apr 2022 01:27:56 +0000
Subject: [PATCH] Revert "ext4: fix file system corrupted when rmdir non empty
 directory with IO error"

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I52WOM
CVE: NA

--------------------------------

This reverts commit 35bd50bcc346402fb5bac3e3393876f6c5644ca9.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Signed-off-by: Yongqiang Liu <liuyongqiang13@huawei.com>
---
 fs/ext4/namei.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index 84f68e15e853..58dd74b80480 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2750,7 +2750,7 @@ bool ext4_empty_dir(struct inode *inode)
 	 */
 	bh = ext4_read_dirblock(inode, 0, DIRENT_HTREE);
 	if (IS_ERR(bh))
-		return false;
+		return true;
 
 	de = (struct ext4_dir_entry_2 *) bh->b_data;
 	if (ext4_check_dir_entry(inode, NULL, de, bh, bh->b_data, bh->b_size,
@@ -2781,7 +2781,7 @@ bool ext4_empty_dir(struct inode *inode)
 				continue;
 			}
 			if (IS_ERR(bh))
-				return false;
+				return true;
 		}
 		de = (struct ext4_dir_entry_2 *) (bh->b_data +
 					(offset & (sb->s_blocksize - 1)));
-- 
GitLab