[v2,10/19] ext4: fix wrong unit use in ext4_mb_clear_bb

Message ID	20230412172833.2317696-11-shikemeng@huaweicloud.com
State	Superseded
Headers	show Return-Path: <SRS0=O2JB=AD=vger.kernel.org=linux-ext4-owner@ozlabs.org> From: Kemeng Shi <shikemeng@huaweicloud.com> To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, shikemeng@huaweicloud.com Subject: [PATCH v2 10/19] ext4: fix wrong unit use in ext4_mb_clear_bb Date: Thu, 13 Apr 2023 01:28:24 +0800 Message-Id: <20230412172833.2317696-11-shikemeng@huaweicloud.com> In-Reply-To: <20230412172833.2317696-1-shikemeng@huaweicloud.com> References: <20230412172833.2317696-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	Fixes, cleanups and unit test for mballoc \| expand [v2,00/19] Fixes, cleanups and unit test for mballoc [v2,01/19] ext4: fix wrong unit use in ext4_mb_normalize_request [v2,02/19] ext4: fix unit mismatch in ext4_mb_new_blocks_simple [v2,03/19] ext4: fix wrong unit use in ext4_mb_find_by_goal [v2,04/19] ext4: treat stripe in block unit [v2,05/19] ext4: add EXT4_MB_HINT_GOAL_ONLY test in ext4_mb_use_preallocated [v2,06/19] ext4: remove ext4_block_group and ext4_block_group_offset declaration [v2,07/19] ext4: try all groups in ext4_mb_new_blocks_simple [v2,08/19] ext4: get block from bh before pass it to ext4_free_blocks_simple in ext4_free_blocks [v2,09/19] ext4: remove unsed parameter and unnecessary forward declaration of ext4_mb_new_blocks_s… [v2,10/19] ext4: fix wrong unit use in ext4_mb_clear_bb [v2,11/19] ext4: fix wrong unit use in ext4_mb_new_blocks [v2,12/19] ext4: factor out codes to update block bitmap and group descriptor on disk from ext4_mb_… [v2,13/19] ext4: call ext4_mb_mark_group_bb in ext4_free_blocks_simple [v2,14/19] ext4: extent ext4_mb_mark_group_bb to support allocation under journal [v2,15/19] ext4: call ext4_mb_mark_group_bb in ext4_mb_mark_diskspace_used [v2,16/19] ext4: call ext4_mb_mark_group_bb in ext4_mb_clear_bb [v2,17/19] ext4: call ext4_mb_mark_group_bb in ext4_group_add_blocks [v2,18/19] ext4: add some kunit stub for mballoc kunit test [v2,19/19] ext4: add first unit test for ext4_mb_new_blocks_simple in mballoc

Message ID

20230412172833.2317696-11-shikemeng@huaweicloud.com

State

Superseded

Headers

From: Kemeng Shi <shikemeng@huaweicloud.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, ojaswin@linux.ibm.com
Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org,
        shikemeng@huaweicloud.com
Subject: [PATCH v2 10/19] ext4: fix wrong unit use in ext4_mb_clear_bb
Date: Thu, 13 Apr 2023 01:28:24 +0800
Message-Id: <20230412172833.2317696-11-shikemeng@huaweicloud.com>
In-Reply-To: <20230412172833.2317696-1-shikemeng@huaweicloud.com>
References: <20230412172833.2317696-1-shikemeng@huaweicloud.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

Fixes, cleanups and unit test for mballoc | expand

Commit Message

Kemeng Shi April 12, 2023, 5:28 p.m. UTC

Function ext4_issue_discard need count in cluster. Pass count_clusters
instead of count to fix the mismatch.

Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
 fs/ext4/mballoc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
index 2bbfded78093..eac91b2e3aa3 100644
--- a/fs/ext4/mballoc.c
+++ b/fs/ext4/mballoc.c
@@ -6029,8 +6029,8 @@  static void ext4_mb_clear_bb(handle_t *handle, struct inode *inode,
 		 * them with group lock_held
 		 */
 		if (test_opt(sb, DISCARD)) {
-			err = ext4_issue_discard(sb, block_group, bit, count,
-						 NULL);
+			err = ext4_issue_discard(sb, block_group, bit,
+						 count_clusters, NULL);
 			if (err && err != -EOPNOTSUPP)
 				ext4_msg(sb, KERN_WARNING, "discard request in"
 					 " group:%u block:%d count:%lu failed"

[v2,10/19] ext4: fix wrong unit use in ext4_mb_clear_bb

Commit Message

Patch