diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
index f4dd3a7ee9656ec4cae7c7134484730ce42ed264..a335ed80a9e3706624e3d1cc59643029b85954df 100644
--- a/fs/ext4/namei.c
+++ b/fs/ext4/namei.c
@@ -2986,11 +2986,8 @@ bool ext4_empty_dir(struct inode *inode)
 		de = (struct ext4_dir_entry_2 *) (bh->b_data +
 					(offset & (sb->s_blocksize - 1)));
 		if (ext4_check_dir_entry(inode, NULL, de, bh,
-					 bh->b_data, bh->b_size, offset)) {
-			offset = (offset | (sb->s_blocksize - 1)) + 1;
-			continue;
-		}
-		if (le32_to_cpu(de->inode)) {
+					 bh->b_data, bh->b_size, offset) ||
+		    le32_to_cpu(de->inode)) {
 			brelse(bh);
 			return false;
 		}