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 BBFB51D0493; Wed, 2 Oct 2024 14:47:22 +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=1727880442; cv=none; b=XNuaNutawwnA+jwyjFlu+TI2syGtqjTo+5zncd6hKrl9wGWeKFrlgmcFx0mCoz0hq8oEUX2xRXk8KVXbj1trlInuTlrYgcv4ikmjEzlOq2eww5aqFv7pZZRvnMOk2+UjVDlBDDpZsmthpsG66qM5dkvUxxccQElu0H4RpSWovC8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727880442; c=relaxed/simple; bh=wlisF56R+bb8pvBbuEHuf2j2Sq4r0vKWGfstpMQ+hlA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Y3HQ7sK2emhY2vEIi0qQAM0EpdY+VfzyRexvx6VAKfPQBupI4dsvXi2i0KvDhUMzv1T7dEKiUQwbVtHJ+QfreiUmLozVziVIzS/+ZB8ITiVDVwzRnTxAFb2YzAgRTeIYraaM5znKkeketJmfJ7PfxaLPTYR0muSkyyPqPF+11Ms= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=N8nvpDEg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="N8nvpDEg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E07EC4CEC2; Wed, 2 Oct 2024 14:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727880442; bh=wlisF56R+bb8pvBbuEHuf2j2Sq4r0vKWGfstpMQ+hlA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=N8nvpDEgJnIspEHBUL123LIZhupPT/7ZtW+cxOvBgMIApAfAYLoGivGtG6dimlusA jRwwojnSsOGGuOpti9h9AOX/djdIY+RksB8lxpH37/KBeLpSQTioi1grIh4483DVC1 2wbVhfu0lAvQNqz+iz3z1NaQk+eHuJ6xrlwOQDtU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qu Wenruo , Luca Stefani , David Sterba Subject: [PATCH 6.6 460/538] btrfs: always update fstrim_range on failure in FITRIM ioctl Date: Wed, 2 Oct 2024 15:01:39 +0200 Message-ID: <20241002125810.601848276@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125751.964700919@linuxfoundation.org> References: <20241002125751.964700919@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Luca Stefani commit 3368597206dc3c6c3c2247ee146beada14c67380 upstream. Even in case of failure we could've discarded some data and userspace should be made aware of it, so copy fstrim_range to userspace regardless. Also make sure to update the trimmed bytes amount even if btrfs_trim_free_extents fails. CC: stable@vger.kernel.org # 5.15+ Reviewed-by: Qu Wenruo Signed-off-by: Luca Stefani Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/extent-tree.c | 4 ++-- fs/btrfs/ioctl.c | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -6175,13 +6175,13 @@ int btrfs_trim_fs(struct btrfs_fs_info * continue; ret = btrfs_trim_free_extents(device, &group_trimmed); + + trimmed += group_trimmed; if (ret) { dev_failed++; dev_ret = ret; break; } - - trimmed += group_trimmed; } mutex_unlock(&fs_devices->device_list_mutex); --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -533,13 +533,11 @@ static noinline int btrfs_ioctl_fitrim(s range.minlen = max(range.minlen, minlen); ret = btrfs_trim_fs(fs_info, &range); - if (ret < 0) - return ret; if (copy_to_user(arg, &range, sizeof(range))) return -EFAULT; - return 0; + return ret; } int __pure btrfs_is_empty_uuid(u8 *uuid)