From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A0625C4332F for ; Wed, 21 Dec 2022 06:01:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 407638E0008; Wed, 21 Dec 2022 01:01:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B8328E0001; Wed, 21 Dec 2022 01:01:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27F1F8E0008; Wed, 21 Dec 2022 01:01:43 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1A0018E0001 for ; Wed, 21 Dec 2022 01:01:43 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E850B80946 for ; Wed, 21 Dec 2022 06:01:42 +0000 (UTC) X-FDA: 80265266844.12.6C5060C Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by imf16.hostedemail.com (Postfix) with ESMTP id 5DAFB180009 for ; Wed, 21 Dec 2022 06:01:41 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=UjDk03Xn; spf=pass (imf16.hostedemail.com: domain of vernon2gm@gmail.com designates 209.85.215.174 as permitted sender) smtp.mailfrom=vernon2gm@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1671602501; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pxb84ytAPFYreSOdPkhL3PM7KemIvxiY/1J13wK332c=; b=krcvaR6Xpf2Y5gLHMfSMT5fGo8qvhFkUGWUbrOdOUfMYFhUkfHZJwwTJdosfGa8yQyr2w6 xnHm2GQEfjPfNt5Rccswm/x+3HmdYlD5T4Kk5FsPT0Qmrm9ndIKfvBfMWGMeFwNFaoUebY jcEu6XPl+bKHLMHOAYBODlsYsxvMZOU= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=UjDk03Xn; spf=pass (imf16.hostedemail.com: domain of vernon2gm@gmail.com designates 209.85.215.174 as permitted sender) smtp.mailfrom=vernon2gm@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1671602501; a=rsa-sha256; cv=none; b=ONbZZJeX5pyFwzMzta+BCPE5SvZmabIq2J9mL0C7LJ8WNrJwAN2uL6LLt7CZKyhBKnT/sX YFmPlx8GKb67CarajitkgwY2M7SP2wcTBNUgOr+Vzmjem1GypIl2JwkX9v4znqM7FgX8Ls aA7eatZCkoNBKv9YCwTkZpVnqB0VWtM= Received: by mail-pg1-f174.google.com with SMTP id b12so9746739pgj.6 for ; Tue, 20 Dec 2022 22:01:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pxb84ytAPFYreSOdPkhL3PM7KemIvxiY/1J13wK332c=; b=UjDk03Xng4Fdh5jRhus2wH9UUuHAQyoFWmA2K42x+nWA7pqpImyeM0Kt2r5uZQ0hXF vw9C9qsE1YdAAUSnNHaCc8Btp8sLRss51PLxbbpIe2YiycY8rITES89MtLAHVNd5vzum zGGUeuc8OrQQuOqapwjOl9rPfBtU6BXem5qzstlBpIJRxC5vKgsT8Aa2Tbc/O4Yq1HpW fQrUq/T9UadAmhL9DW39kwVKpbD21TMHt+o17qb5vLqtU5IWH1CCmhnY3HPHlm59W9pz VaxdRz/9zO3jznGR0DfTxjUts8mfxb+KUgaHEh0h5ET7bku0Tn1IK4kfxOUW4IgjFYM4 cjvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pxb84ytAPFYreSOdPkhL3PM7KemIvxiY/1J13wK332c=; b=xizuKQ2YDRdlN9TYxoIoz/i6op8pS9jGa3Yn2dIAj2y1aZS7pzI1CP+J1YgI6prMad nDPX5tbbXlXHBv8m5RMhV7NF2s8VW+TiLJwpFEeV7qjALN0AIyPsBjMVxeDUEWb1q8gN tyUJtqYI7UD2iArOhSlcs1YyTpx7xdA6RaalsWqQZyGZkPhGBpQWhXyO+omwOM/p31V2 a9YeywYA2dM0MVaPGfY09TrzZZmlCefOdXnVPZHRu+Ob/67dgHfgKrOurd0S8qlvH0eM IWhGXUddxMKH2xXrizY79w6rwWnIehMOtHeAvePR9jGjgnx6OGd+2a+Am19WB257q2G0 2lYQ== X-Gm-Message-State: AFqh2kq5MVlyHzGujYlXEnnB/eds5Rk43f03ooIJXD+tbTCtGvBQCyJJ GNauqDGlDUlSYk6UGH4YLCM= X-Google-Smtp-Source: AMrXdXtMQNG4MLPAQuAxM6F8pv2SymackH14UvCmmp2Lj0VLowO3NVPJe1mW7SvC4gzZLgCzhayhhQ== X-Received: by 2002:aa7:81d4:0:b0:56e:a7a7:35a0 with SMTP id c20-20020aa781d4000000b0056ea7a735a0mr1036849pfn.25.1671602500364; Tue, 20 Dec 2022 22:01:40 -0800 (PST) Received: from vernon-pc.. ([114.231.52.81]) by smtp.gmail.com with ESMTPSA id w7-20020a626207000000b00562677968aesm9598886pfb.72.2022.12.20.22.01.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Dec 2022 22:01:39 -0800 (PST) From: Vernon Yang To: Liam.Howlett@oracle.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Vernon Yang Subject: [PATCH v2 6/7] maple_tree: refine ma_state init from mas_start() Date: Wed, 21 Dec 2022 14:00:57 +0800 Message-Id: <20221221060058.609003-7-vernon2gm@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221221060058.609003-1-vernon2gm@gmail.com> References: <20221221060058.609003-1-vernon2gm@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5DAFB180009 X-Stat-Signature: az4kcoqdrx6wnrj4aiccjeiyyux8yug6 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1671602501-935802 X-HE-Meta: U2FsdGVkX18eL6xnLUGHQOE/BFwATDqy1LIVvyu55g2svP9V8e/RPp2a6CnHThrA+onzgD763sa8EvYnOQ8oRuLe3NPrvbgiPt1ieHv0qAMZgZFUENVQNAGH5UBf9KJ01RLx27Xxmg3aaC5auIjFfLDjDmkdee5MbNXkRtaUMiNhitqmOSFexe8Pietv1FkdlVnTexOBS079wxcoQyneSBxnAWgaQpT7DrvTZIEV1cTSD3v+Dmp8hwNeVTe69s1m+xLleUMQSNlWtZ+4EVTLrIWQBb4pCnd2uNWbOw7+jE2uHoUVVfR7D39DoBQfCEYg0rpxN397lxPs3EArU4nyVgrlnR63gVz+yQFhCQRWSzzSS9YkQR38kDxHGTQiUAsyZtN6GbG1QtoWGjHj+smioJ/etBGmyzfQCMpi383fmhE54DFUqeVL7ZRKXbCK8n0M7ki00ofHNvOEsBwBMAqCnoA9sSzuZBMqgCA0v+x1TNCH9v/f1lc9kndGPaW90JmTJIdysalpTxXI/6aoKv1q869eztHsSNEKjqrtacyCECZQZAK2NNofHRvtXVvvmeVrakYePrHr0hDOvdh0LQTplBgPG4yof1pEDkbbd/N2Ha/rRAVaKPgVD/+Fzha3ZebeHd01TopU6K/0tlssjFKfIfHB1AHlkfkH7BZ4oqaHTS6v4XwIU/C06GRjeDMSbJ0JS+lC234LNOnS0hN9jwhHR5UitXZd9oEV/MkPrg6fOu3pqtjRTGLfnQoRWOtvg50NIZGBgYTODcunxCoz/Nf15OQB0yoixVUitwR9xpU2/Fi43eD8OG5A3iEn1nXZ9sxhCfnT2uKx9WihU8BTDLXahzt3HA/BmH2Xhb31g7JcDFc7psnlSmh6HydTh6SsXkX+vP9fXXSpCK1JgWpGc+wELzPVege2Qljwi9rpXyzyQfehd40IIEDmd7YSu+8BQtiYhacUdxBMEHVH5Fg58oC XrvKW+KX DfFZYC2QlzACQ2QN5FcXHlNKljJaLm4jSAFqo+EiRc46OYxhw44s0wGOFi1iaKRUG+XDIMySEW5SmilSs2n5AhGtTP8V6RIyhEILgJ/LQ787YrnaV+MzPJ6xHEC6rEmUPW/05Vze9bRL2LfxiOgVjknzAJDU37b8d4hGVLaMOkzeHMMY= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: If mas->node is an MAS_START, there are three cases, and they all assign different values to mas->node and mas->offset. So there is no need to set them to a default value before updating. Update them directly to make them easier to understand and for better readability. Reviewed-by: Liam R. Howlett Signed-off-by: Vernon Yang --- lib/maple_tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index b3a215dd961e..5911211c8557 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -1329,7 +1329,7 @@ static void mas_node_count(struct ma_state *mas, int count) * mas_start() - Sets up maple state for operations. * @mas: The maple state. * - * If mas->node == MAS_START, then set the min, max, depth, and offset to + * If mas->node == MAS_START, then set the min, max and depth to * defaults. * * Return: @@ -1343,22 +1343,22 @@ static inline struct maple_enode *mas_start(struct ma_state *mas) if (likely(mas_is_start(mas))) { struct maple_enode *root; - mas->node = MAS_NONE; mas->min = 0; mas->max = ULONG_MAX; mas->depth = 0; - mas->offset = 0; root = mas_root(mas); /* Tree with nodes */ if (likely(xa_is_node(root))) { mas->depth = 1; mas->node = mte_safe_root(root); + mas->offset = 0; return NULL; } /* empty tree */ if (unlikely(!root)) { + mas->node = MAS_NONE; mas->offset = MAPLE_NODE_SLOTS; return NULL; } -- 2.34.1