Skip to contentSkip to conversation

btrfs: Always update fstrim_range on failure

PATCH Superseded Luca Stefani 2 participants 2 messages Sep 2, 2024 Btrfs file system

v1 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: Always update fstrim_range on failure

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.

---
 fs/btrfs/extent-tree.c | 4 ++--
 fs/btrfs/ioctl.c       | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)
fs/btrfs/extent-tree.c +2 -2
index feec49e6f9c8..a5966324607d 100644
@@ -6551,13 +6551,13 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)
 			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);
 
fs/btrfs/ioctl.c +1 -3
index e0a664b8a46a..94d8f29b04c5 100644
@@ -543,13 +543,11 @@ static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info,
 
 	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(const u8 *uuid)
Signature · 1 line
2.46.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Luca Stefani

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.

Thanks,
Qu

Quoted 44 lines
---
  fs/btrfs/extent-tree.c | 4 ++--
  fs/btrfs/ioctl.c       | 4 +---
  2 files changed, 3 insertions(+), 5 deletions(-)
fs/btrfs/extent-tree.c +2 -2
index feec49e6f9c8..a5966324607d 100644
@@ -6551,13 +6551,13 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)
  			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);
 
fs/btrfs/ioctl.c +1 -3
index e0a664b8a46a..94d8f29b04c5 100644
@@ -543,13 +543,11 @@ static noinline int btrfs_ioctl_fitrim(struct btrfs_fs_info *fs_info,
 
  	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(const u8 *uuid)