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 X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D035DC43215 for ; Fri, 15 Nov 2019 14:05:40 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8B97720732 for ; Fri, 15 Nov 2019 14:05:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="oD+ifSS2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8B97720732 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1BF556B0005; Fri, 15 Nov 2019 09:05:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 171686B0008; Fri, 15 Nov 2019 09:05:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 086486B000C; Fri, 15 Nov 2019 09:05:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0114.hostedemail.com [216.40.44.114]) by kanga.kvack.org (Postfix) with ESMTP id E7F486B0005 for ; Fri, 15 Nov 2019 09:05:39 -0500 (EST) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 894F6824934B for ; Fri, 15 Nov 2019 14:05:39 +0000 (UTC) X-FDA: 76158684798.24.boot64_6b91c8da0b51b X-HE-Tag: boot64_6b91c8da0b51b X-Filterd-Recvd-Size: 4910 Received: from mail-qv1-f67.google.com (mail-qv1-f67.google.com [209.85.219.67]) by imf36.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Nov 2019 14:05:39 +0000 (UTC) Received: by mail-qv1-f67.google.com with SMTP id n12so3810760qvt.1 for ; Fri, 15 Nov 2019 06:05:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=yP6sLpOI5gMHsWCnZ/lSHS0qOmzpZuHlPWbPumaUgRc=; b=oD+ifSS2SKqGImF4vBVAx87ixxYxtspxZw6PhenI10A2wEXjPO29zGqx1N9Wd0+4LH +xUQZe/Gxq2fg34qiWpzCEYKWDRugT8UF4ruFaaMeU3kgMdXOrvzhHfSXkhocNp3OOQO xoH/JYJv0F7hUkK4xTYbb+0j/2Xu9syfn9BagNvtVCCxUkg+GubztuWtiThoFt8EGcEr ARxbR1SyJ2MAChtAe3EuiQ73LUxk0DMdKlP/801OcACVB2F5UwVqXNjAJEPK+hW2SKf+ V51cNhtnRuomj1wKxenCSgk/3EBwiWMKKaqpRQQVtyJUXOiHCh/k9+MIhcijTCxodZSK iK7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=yP6sLpOI5gMHsWCnZ/lSHS0qOmzpZuHlPWbPumaUgRc=; b=CaAmzsiciKhDMTAQGj54Khz9hCDl3JhyJqFgHjqdbCUP4iPPQwtBj4yKQh8ipBCJLY d5D0L1EjEYs9htccwfPJSXSS7KdjMNEw9VXixgvpdbsldhQmhXLqp2Nvkd+PLLmOjHwM 5N40l28SsG2HtEPrZzkpWoYw/YsdNRMcP1rv1S2F0m9kehvu8F8NkNlfluoIdUzxWnpZ lKn9My1bhhQfWoeNAM/8MAxerfXOW28CmGKG5ILR4xa6bUI6ZwAUShb+6DZ/ZJ/DgMr9 baTq+WYMfwdHwDzozbSfZgBb6d4u+8Uh9PfqwgWd8SChViLIGgDDbTp8rVkofyjd3WCp qXWg== X-Gm-Message-State: APjAAAXZN7NeIiidxhArmU8lWZ+K+oLakTIoO9Cn9w/bUXZf5l5ZU78d w1KU70QqhZcHo/PNMJPAOpCE4w== X-Google-Smtp-Source: APXvYqxx+BgTj06EwM9BZfvsjh6JPSIXQtx4APEYcMMw1ZXobyEcgnrGVoKzFyNUCOpPdoBzLYnVQQ== X-Received: by 2002:ad4:42a8:: with SMTP id e8mr13473546qvr.217.1573826738297; Fri, 15 Nov 2019 06:05:38 -0800 (PST) Received: from qcai.nay.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id j10sm4989769qtb.34.2019.11.15.06.05.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 06:05:37 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, surenb@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next] mm/vmscan: fix some -Wenum-conversion warnings Date: Fri, 15 Nov 2019 09:04:57 -0500 Message-Id: <1573826697-869-1-git-send-email-cai@lca.pw> X-Mailer: git-send-email 1.8.3.1 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: The -next commit "mm: vmscan: enforce inactive:active ratio at the reclaim root" [1] introduced some GCC -Wenum-conversion warnings, mm/vmscan.c:2216:39: warning: implicit conversion from enumeration type 'enum lru_list' to different enumeration type 'enum node_stat_item' [-Wenum-conversion] inactive = lruvec_page_state(lruvec, inactive_lru); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~ mm/vmscan.c:2217:37: warning: implicit conversion from enumeration type 'enum lru_list' to different enumeration type 'enum node_stat_item' [-Wenum-conversion] active = lruvec_page_state(lruvec, active_lru); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~ mm/vmscan.c:2746:42: warning: implicit conversion from enumeration type 'enum lru_list' to different enumeration type 'enum node_stat_item' [-Wenum-conversion] file = lruvec_page_state(target_lruvec, LRU_INACTIVE_FILE); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~ Fix them by adding casts where it is safe. [1] http://lkml.kernel.org/r/20191107205334.158354-4-hannes@cmpxchg.org Signed-off-by: Qian Cai --- mm/vmscan.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 122b3920aaa4..16c005ddfd9e 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2213,8 +2213,9 @@ static bool inactive_is_low(struct lruvec *lruvec, enum lru_list inactive_lru) unsigned long inactive_ratio; unsigned long gb; - inactive = lruvec_page_state(lruvec, inactive_lru); - active = lruvec_page_state(lruvec, active_lru); + inactive = lruvec_page_state(lruvec, + (enum node_stat_item)inactive_lru); + active = lruvec_page_state(lruvec, (enum node_stat_item)active_lru); gb = (inactive + active) >> (30 - PAGE_SHIFT); if (gb) @@ -2743,7 +2744,8 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) * thrashing, try to reclaim those first before touching * anonymous pages. */ - file = lruvec_page_state(target_lruvec, LRU_INACTIVE_FILE); + file = lruvec_page_state(target_lruvec, + (enum node_stat_item)LRU_INACTIVE_FILE); if (file >> sc->priority && !(sc->may_deactivate & DEACTIVATE_FILE)) sc->cache_trim_mode = 1; else -- 1.8.3.1