From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0FC1411E38; Sat, 28 Feb 2026 17:44:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300697; cv=none; b=hoor61G4dc2Z5qqtwI9AZhADKTunvgqkpDKNSecC+JIviNBmibAtUAZa1wWplOdP55BVLzplCu0alqI5dnJ02iCIFXPU8zPAX/zCgB76V0rgFaOBK/vekfDcVe7jjADHCLDGRUjfW0YcF5HMrkH+RaMgX2shl4XmEx+ry8Tpyc8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300697; c=relaxed/simple; bh=8pP6ycsp0TqupfNl0Q2wbJsvX68uudcx08pR2T86QMA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Z/xiRgkNZmpDBTg90Z4B9V3BNpPLXk45Uoeij+EAtzTXHpaKGosXnJwgUEV+MQFq6IZdGADLyUGR4WOHWiV52r1o/KPuFd0PS7CAwVbP0fpCOheU531IDjTlfl8AmONwiBM/QraTvUEd9xAUmbgYzzxJiY6x3P+JevE6XvA4JRc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=N/3vXYGD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="N/3vXYGD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CA38DC116D0; Sat, 28 Feb 2026 17:44:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300697; bh=8pP6ycsp0TqupfNl0Q2wbJsvX68uudcx08pR2T86QMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N/3vXYGDZGF3rOwSckQzeafV0ZtRYbS0PWdDfmGqv+8DDjVBx+CBJMvlvTtDPrUem tbPXayqZlBmq4F9VneM6mkZme9t9rzS4Gbigg4ayLjN8FqgWtcKOKULvB+NS1QGYBy v3KOX64natllCJTEmfTUmbh+b4GClLSqETOwDjlDWdOwEIaXD/FkE6dBg8wXi2b3xf 8UFZ9VmBI1cbiqbOIPelqZX5Zvd93P8f/MLk2/vGc/vpSyA7ZJ1UEJtxwx1XHSSgq9 GzGYvZ4nDgvoFLcEdn73Yf85tjndDn2bTrehZhYRPuuFoobVJYOlUcuD/1Bt53miFe C49JytzwrOfAA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: jinbaohong , Qu Wenruo , Robbie Ko , Filipe Manana , David Sterba , Sasha Levin Subject: [PATCH 6.19 733/844] btrfs: continue trimming remaining devices on failure Date: Sat, 28 Feb 2026 12:30:46 -0500 Message-ID: <20260228173244.1509663-734-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: jinbaohong [ Upstream commit 912d1c6680bdb40b72b1b9204706f32b6eb842c3 ] Commit 93bba24d4b5a ("btrfs: Enhance btrfs_trim_fs function to handle error better") intended to make device trimming continue even if one device fails, tracking failures and reporting them at the end. However, it used 'break' instead of 'continue', causing the loop to exit on the first device failure. Fix this by replacing 'break' with 'continue'. Fixes: 93bba24d4b5a ("btrfs: Enhance btrfs_trim_fs function to handle error better") CC: stable@vger.kernel.org # 5.4+ Reviewed-by: Qu Wenruo Signed-off-by: Robbie Ko Signed-off-by: jinbaohong Reviewed-by: Filipe Manana Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/btrfs/extent-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 8bdb609f58a7e..bc0db6593f329 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6588,7 +6588,7 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) if (ret) { dev_failed++; dev_ret = ret; - break; + continue; } } mutex_unlock(&fs_devices->device_list_mutex); -- 2.51.0