On 26.04.2018 04:27, Liu Bo wrote:
> path->keep_lock may force to lock tree root and higher nodes, and make
> lock contention worse, thus it needs to be avoided as much as
> possible.
>
> In btrfs_degrag_leaves, path->keep_lock is set but @path immediatley
> gets released, which is not necessary at all.
>
This is still very terse and still doesn't explain why keep_locks should
be set right before btrfs_search_slot and not the beginning of the
function. "when necessary" is perhaps the second most uninformative
reason of doing something, right after "because of reasons"
> Signed-off-by: Liu Bo <bo.liu@xxxxxxxxxxxxxxxxx>
> ---
> v2: update commit log with more details.
>
> fs/btrfs/tree-defrag.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/tree-defrag.c b/fs/btrfs/tree-defrag.c
> index 3c0987ab587d..c12747904d4c 100644
> --- a/fs/btrfs/tree-defrag.c
> +++ b/fs/btrfs/tree-defrag.c
> @@ -65,8 +65,6 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
> memcpy(&key, &root->defrag_progress, sizeof(key));
> }
>
> - path->keep_locks = 1;
> -
> ret = btrfs_search_forward(root, &key, path, BTRFS_OLDEST_GENERATION);
> if (ret < 0)
> goto out;
> @@ -81,6 +79,7 @@ int btrfs_defrag_leaves(struct btrfs_trans_handle *trans,
> * a deadlock (attempting to write lock an already write locked leaf).
> */
> path->lowest_level = 1;
> + path->keep_locks = 1;
> wret = btrfs_search_slot(trans, root, &key, path, 0, 1);
>
> if (wret < 0) {
>
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
