Skip to contentSkip to conversation

btrfs: discard before adding to the free space cache

PATCH In review Dennis Zhou 4 participants 4 messages Dec 9, 2019 – Jan 2, 2020 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: discard before adding to the free space cache

Returning free space to the free space cache lets it immediately be reused. So discard before returning the free space otherwise we can race here.

Fixes 55e734b728c0 ("btrfs: Don't discard unwritten extents")
Cc Nikolay Borisov <[email protected]>
Cc Omar Sandoval <[email protected]>
---
 fs/btrfs/inode.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/inode.c +4 -3
index 625439875299..1ab13943cdf0 100644
@@ -3250,13 +3250,14 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
 		    clear_reserved_extent &&
 		    !test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) &&
 		    !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) {
-			btrfs_free_reserved_extent(fs_info,
-						   ordered_extent->start,
-						   ordered_extent->disk_len, 1);
 			if (ret && btrfs_test_opt(fs_info, DISCARD))
 				btrfs_discard_extent(fs_info,
 						ordered_extent->start,
 						ordered_extent->disk_len, NULL);
+
+			btrfs_free_reserved_extent(fs_info,
+						   ordered_extent->start,
+						   ordered_extent->disk_len, 1);
 		}
 	}
 
Signature · 1 line
2.17.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Dennis Zhou

Returning free space to the free space cache lets it immediately be reused. So discard before returning the free space otherwise we can race here.

Fixes 55e734b728c0 ("btrfs: Don't discard unwritten extents")
Cc Nikolay Borisov <[email protected]>
Cc Omar Sandoval <[email protected]>

Fair point.

Quoted 27 lines
---
 fs/btrfs/inode.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
fs/btrfs/inode.c +4 -3
index 625439875299..1ab13943cdf0 100644
@@ -3250,13 +3250,14 @@ static int btrfs_finish_ordered_io(struct btrfs_ordered_extent *ordered_extent)
 		    clear_reserved_extent &&
 		    !test_bit(BTRFS_ORDERED_NOCOW, &ordered_extent->flags) &&
 		    !test_bit(BTRFS_ORDERED_PREALLOC, &ordered_extent->flags)) {
-			btrfs_free_reserved_extent(fs_info,
-						   ordered_extent->start,
-						   ordered_extent->disk_len, 1);
 			if (ret && btrfs_test_opt(fs_info, DISCARD))
 				btrfs_discard_extent(fs_info,
 						ordered_extent->start,
 						ordered_extent->disk_len, NULL);
+
+			btrfs_free_reserved_extent(fs_info,
+						   ordered_extent->start,
+						   ordered_extent->disk_len, 1);
 		}
 	}
 
#3 lore raw
In reply to Dennis Zhou
Quoted 5 lines · Dennis Zhou

Returning free space to the free space cache lets it immediately be reused. So discard before returning the free space otherwise we can race here.

Fixes 55e734b728c0 ("btrfs: Don't discard unwritten extents")

Unstable commit id as the patch is still in misc-next, so I'm going to fold the fix to the original patch. Thanks.