Skip to contentSkip to conversation

btrfs: Remove total_data_size variable in btrfs_batch_insert_items()

PATCH In review Nathan Chancellor 3 participants 3 messages Jun 3, 2021 – Jun 4, 2021 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: Remove total_data_size variable in btrfs_batch_insert_items()

clang warns:

fs/btrfs/delayed-inode.c:684:6: warning: variable 'total_data_size' set but not used [-Wunused-but-set-variable]

        int total_data_size = 0, total_size = 0;
            ^

1 warning generated.

This variable's value has been unused since commit fc0d82e103c7 ("btrfs:
sink total_data parameter in setup_items_for_insert"). Eliminate it.

Fixes fc0d82e103c7 ("btrfs: sink total_data parameter in setup_items_for_insert")
---
 fs/btrfs/delayed-inode.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
fs/btrfs/delayed-inode.c +1 -2
index 2c18ed23aa27..257c1e18abd4 100644
@@ -681,7 +681,7 @@ static int btrfs_batch_insert_items(struct btrfs_root *root,
 {
 	struct btrfs_delayed_item *curr, *next;
 	int free_space;
-	int total_data_size = 0, total_size = 0;
+	int total_size = 0;
 	struct extent_buffer *leaf;
 	char *data_ptr;
 	struct btrfs_key *keys;
@@ -706,7 +706,6 @@ static int btrfs_batch_insert_items(struct btrfs_root *root,
 	 */
 	while (total_size + next->data_len + sizeof(struct btrfs_item) <=
 	       free_space) {
-		total_data_size += next->data_len;
 		total_size += next->data_len + sizeof(struct btrfs_item);
 		list_add_tail(&next->tree_list, &head);
 		nitems++;

base-commit: e1bde17d15921cc866d4ad10a16ce77487516bf7

Signature · 1 line
2.32.0.rc3
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Nathan Chancellor

clang warns:

fs/btrfs/delayed-inode.c:684:6: warning: variable 'total_data_size' set but not used [-Wunused-but-set-variable]

        int total_data_size = 0, total_size = 0;
            ^
Quoted 8 lines

1 warning generated.

This variable's value has been unused since commit fc0d82e103c7 ("btrfs:
sink total_data parameter in setup_items_for_insert"). Eliminate it.

Fixes fc0d82e103c7 ("btrfs: sink total_data parameter in setup_items_for_insert")
#2 lore raw
In reply to Nathan Chancellor
Quoted 6 lines · Nathan Chancellor

clang warns:

fs/btrfs/delayed-inode.c:684:6: warning: variable 'total_data_size' set but not used [-Wunused-but-set-variable]

        int total_data_size = 0, total_size = 0;
            ^
Quoted 8 lines

1 warning generated.

This variable's value has been unused since commit fc0d82e103c7 ("btrfs:
sink total_data parameter in setup_items_for_insert"). Eliminate it.

Fixes fc0d82e103c7 ("btrfs: sink total_data parameter in setup_items_for_insert")

Added to misc-next, thanks. I've removed the Fixes: tag, we've been using this is for patches that should be backported or otherwise point to a patch that causes a real bug.