kernel.git/fs/btrfs/ctree.c, branch master

btrfs: merge setting ret and return ret

2026-02-03T05:38:33Z

In many places we have pattern: ret = ...; return ret; This can be simplified to a direct return, removing 'ret' if not otherwise needed. The places in self tests are not converted so we can add more test cases without changing surrounding code (extent-map-tests.c:test_case_4()). Signed-off-by: David Sterba

btrfs: simplify boolean argument for btrfs_inc_ref()/btrfs_dec_ref()

2026-02-03T05:38:31Z

Replace open-coded if/else blocks with the boolean directly and introduce local const bool variables, making the code shorter and easier to read. Signed-off-by: Sun YangKai Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: use true/false for boolean parameters in btrfs_inc_ref()/btrfs_dec_ref()

2026-02-03T05:38:31Z

Replace integer literals 0/1 with true/false when calling btrfs_inc_ref() and btrfs_dec_ref() to make the code self-documenting and avoid mixing bool/integer types. Signed-off-by: Sun YangKai Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: remove redundant level reset in btrfs_del_items()

2025-11-25T00:50:56Z

When btrfs_del_items() empties a leaf, it deletes the leaf unless it's the root node. For the root leaf case, the code used to reset its level to 0 via btrfs_set_header_level(). This is redundant as leaf nodes always have level == 0. Remove the unnecessary level assignment and invert the conditional to handle only the non-root leaf deletion. The root leaf is correctly left as-is. Signed-off-by: Sun YangKai Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: simplify leaf traversal after path release in btrfs_next_old_leaf()

2025-11-25T00:50:56Z

After releasing the path in btrfs_next_old_leaf(), we need to re-check the leaf because a balance operation may have added items or removed the last item. The original code handled this with two separate conditional blocks, the second marked with a lengthy comment explaining a "missed case". Merge these two blocks into a single logical structure that handles both scenarios more clearly. Also update the comment to be more concise and accurate, incorporating the explanation directly into the main block rather than a separate annotation. Signed-off-by: Sun YangKai Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: optimize balance_level() path reference handling

2025-11-25T00:50:56Z

Instead of incrementing refcount on 'left' node when it's referenced by path, simply transfer ownership to path and set left to NULL. This eliminates: - Unnecessary refcount increment/decrement operations - Redundant conditional checks for left node cleanup The path now consistently owns the left node reference when used. Signed-off-by: Sun YangKai Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: factor out root promotion logic into promote_child_to_root()

2025-11-25T00:50:56Z

The balance_level() function is overly long and contains a cold code path that handles promoting a child node to root when the root has only one item. This code has distinct logic that is clearer and more maintainable when isolated in its own function. Signed-off-by: Sun YangKai Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: use bool type for btrfs_path members used as booleans

2025-11-24T21:42:25Z

Many fields of struct btrfs_path are used as booleans but their type is an unsigned int (of one 1 bit width to save space). Change the type to bool keeping the :1 suffix so that they combine with the previous u8 fields in order to save space. This makes the code more clear by using explicit true/false and more in line with the preferred style, preserving the size of the structure. Reviewed-by: Johannes Thumshirn Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: update check_skip variable after unlocking current node

2025-11-24T21:42:25Z

There's no need to update the local variable 'check_skip' to false inside the critical section delimited by the lock of the current node, so do it after unlocking the node. Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba

btrfs: abort transaction on item count overflow in __push_leaf_left()

2025-11-24T21:42:25Z

If we try to push an item count from the right leaf that is greater than the number of items in the leaf, we just emit a warning. This should never happen but if it does we get an underflow in the new number of items in the right leaf and chaos follows from it. So replace the warning with proper error handling, by aborting the transaction and returning -EUCLEAN, and proper logging by using btrfs_crit() instead of WARN(), which gives us proper formatting and information about the filesystem. Reviewed-by: Qu Wenruo Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba