Skip to contentSkip to conversation

btrfs: Remove redundant initialization of 'to_add'

PATCH Superseded Yang Li 2 participants 2 messages May 14, 2021 – May 16, 2021 Btrfs file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Yang Li

author
#0 lore raw

PATCH 1/1 btrfs: Remove redundant initialization of 'to_add'

Variable 'to_add' is being initialized however this value is never read as 'to_add' is assigned a new value in if statement. Remove the redundant assignment. At the same time, move its declaration into the if statement, because the variable is not used elsewhere.

Clean up clang warning:

fs/btrfs/extent-tree.c:2773:8: warning: Value stored to 'to_add' during its initialization is never read [clang-analyzer-deadcode.DeadStores]

---
 fs/btrfs/extent-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent-tree.c +1 -1
index f1d15b6..e7b2289 100644
@@ -2774,10 +2774,10 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
 		spin_unlock(&cache->lock);
 		if (!readonly && return_free_space &&
 		    global_rsv->space_info == space_info) {
-			u64 to_add = len;
 
 			spin_lock(&global_rsv->lock);
 			if (!global_rsv->full) {
+				u64 to_add;
 				to_add = min(len, global_rsv->size -
 					     global_rsv->reserved);
 				global_rsv->reserved += to_add;
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 22 lines · Yang Li

Variable 'to_add' is being initialized however this value is never read as 'to_add' is assigned a new value in if statement. Remove the redundant assignment. At the same time, move its declaration into the if statement, because the variable is not used elsewhere.

Clean up clang warning:

fs/btrfs/extent-tree.c:2773:8: warning: Value stored to 'to_add' during its initialization is never read [clang-analyzer-deadcode.DeadStores]

---
 fs/btrfs/extent-tree.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/extent-tree.c +0 -0
index f1d15b6..e7b2289 100644

fs/btrfs/extent-tree.c static int unpin_extent_range(struct btrfs_fs_info *fs_info, · line 2782

Quoted 10 lines
fs/btrfs/extent-tree.c +1 -1
@@ -2774,10 +2774,10 @@ static int unpin_extent_range(struct btrfs_fs_info *fs_info,
                spin_unlock(&cache->lock);
                if (!readonly && return_free_space &&
                    global_rsv->space_info == space_info) {
-                       u64 to_add = len;
 
                        spin_lock(&global_rsv->lock);
                        if (!global_rsv->full) {
+                               u64 to_add;
                                to_add = min(len, global_rsv->size -
                                             global_rsv->reserved);

Yang Li, you could just combine these two lines above, right?

So:
u64 to_add = min(len, ...);

By the way, great contribution on addressing all those dead stores identified by clang analyzer... I wish I would also have more time on addressing some of those remaining...

Lukas