btrfs: rename btrfs_space_info_add_old_bytes

josefbacik · kdave · commit d05e46497f86 · 2019-09-09T14:59:18.000+02:00
This name doesn't really fit with how the space reservation stuff works
now, rename it to btrfs_space_info_free_bytes_may_use so it's clear what
the function is doing.

Reviewed-by: Nikolay Borisov &lt;nborisov@suse.com&gt;
Signed-off-by: Josef Bacik &lt;josef@toxicpanda.com&gt;
Reviewed-by: David Sterba &lt;dsterba@suse.com&gt;
Signed-off-by: David Sterba &lt;dsterba@suse.com&gt;
diff --git a/fs/btrfs/block-rsv.c b/fs/btrfs/block-rsv.c
@@ -54,8 +54,9 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,
 			spin_unlock(&dest->lock);
 		}
 		if (num_bytes)
-			btrfs_space_info_add_old_bytes(fs_info, space_info,
-						       num_bytes);
+			btrfs_space_info_free_bytes_may_use(fs_info,
+							    space_info,
+							    num_bytes);
 	}
 	if (qgroup_to_release_ret)
 		*qgroup_to_release_ret = qgroup_to_release;
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
@@ -158,7 +158,7 @@ void btrfs_migrate_to_delayed_refs_rsv(struct btrfs_fs_info *fs_info,
 		trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv",
 					      0, num_bytes, 1);
 	if (to_free)
-		btrfs_space_info_add_old_bytes(fs_info,
+		btrfs_space_info_free_bytes_may_use(fs_info,
 				delayed_refs_rsv->space_info, to_free);
 }
 
diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
@@ -129,7 +129,7 @@ int btrfs_reserve_metadata_bytes(struct btrfs_root *root,
 void btrfs_try_granting_tickets(struct btrfs_fs_info *fs_info,
 				struct btrfs_space_info *space_info);
 
-static inline void btrfs_space_info_add_old_bytes(
+static inline void btrfs_space_info_free_bytes_may_use(
 				struct btrfs_fs_info *fs_info,
 				struct btrfs_space_info *space_info,
 				u64 num_bytes)

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,9 @@ static u64 block_rsv_release_bytes(struct btrfs_fs_info *fs_info,`
`54`	`54`	`spin_unlock(&dest->lock);`
`55`	`55`	`}`
`56`	`56`	`if (num_bytes)`
`57`		`- btrfs_space_info_add_old_bytes(fs_info, space_info,`
`58`		`- num_bytes);`
	`57`	`+ btrfs_space_info_free_bytes_may_use(fs_info,`
	`58`	`+ space_info,`
	`59`	`+ num_bytes);`
`59`	`60`	`}`
`60`	`61`	`if (qgroup_to_release_ret)`
`61`	`62`	`*qgroup_to_release_ret = qgroup_to_release;`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void btrfs_migrate_to_delayed_refs_rsv(struct btrfs_fs_info *fs_info,`
`158`	`158`	`trace_btrfs_space_reservation(fs_info, "delayed_refs_rsv",`
`159`	`159`	`0, num_bytes, 1);`
`160`	`160`	`if (to_free)`
`161`		`- btrfs_space_info_add_old_bytes(fs_info,`
	`161`	`+ btrfs_space_info_free_bytes_may_use(fs_info,`
`162`	`162`	`delayed_refs_rsv->space_info, to_free);`
`163`	`163`	`}`
`164`	`164`