From patchwork Thu Jun 21 07:03:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia-Ju Bai X-Patchwork-Id: 10479279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 72959604D3 for ; Thu, 21 Jun 2018 07:05:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53D9228F3B for ; Thu, 21 Jun 2018 07:05:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E0C6D28F7A; Thu, 21 Jun 2018 07:05:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 22E4F28E59 for ; Thu, 21 Jun 2018 07:03:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CDFFF6B0007; Thu, 21 Jun 2018 03:03:41 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C905B6B0008; Thu, 21 Jun 2018 03:03:41 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B7F316B000A; Thu, 21 Jun 2018 03:03:41 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 77A896B0007 for ; Thu, 21 Jun 2018 03:03:41 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id n19-v6so1100260pff.8 for ; Thu, 21 Jun 2018 00:03:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id; bh=szKF+gnXyFXIku5VW3IbELUbDP8o2QPq0Oibn8D+kV0=; b=hCE4dFDWn5tFCBDvcgdI4FD8SXGzd1bTOxWYIyoMys8w6Cmw0ugTba13edS0v0OMgg EGX5J+kSysI9O0Ql6oVMWAuNEw9byfZyYr0dMU4Q5WKNW/5c87ef2JQEQF/zt/M3OySH rl6bc45dOUQ048XYPEQDFbw6knsaMLUf4pR/jd6Wt6Xz+DLos7Eqrpt9ocQ6Vi7x1aWC Tvw7OxJ1K7gRftJ/Zhc6XITNNfvRXBcmaiVx3942zSPLVTvnzuTibSpHSpnqlkCjcCb+ oxeP6Dpy9LziVTvlAVT03zr9qO4geECr+7Dd4zqgDmPeGKKkaDhAg8dWL6y/vLyAN5hD j7Hg== X-Gm-Message-State: APt69E3YrK9esx1DI+T9Ux+s0Xm8TZVO8VmkMKG8YTR70iwi5jIBZgpv sV1m9co5bZ96y/kxV5qkhHaRCYnKEsTdk4SzTGBGtDQuN9D+4QuTTy5LEVHIXh4OuFlwRMDuRDa etDbC0SdpIzBX7tR7hjFSQK7efeHr/+OZntQsm2nFsO8bba9RxfsdZrP3cCf2ZNSsn5D9Yg15/L 60OhOuK94KHgKLrbCf9ohEBvagSMmFfH4Ad3ADFuVHmjakXqWtDEkQxdUyLs98+lUsVV32y3Pgb THdGzS7AKwgv+64XP9LaR7Ge2MTLSIy4g3jgrRa0M7SI+srmnrsnCZg7e78YBNSie1VB6KW+/hY 9j9IXRt8LqtNIUwn8MOYKV5+R+Yng/NYY2xW5Y3yeTltRtAk/xFF3QMGX/RnsZjHjWP6K3sn6Mi R X-Received: by 2002:a63:2b15:: with SMTP id r21-v6mr21803302pgr.269.1529564621078; Thu, 21 Jun 2018 00:03:41 -0700 (PDT) X-Received: by 2002:a63:2b15:: with SMTP id r21-v6mr21803257pgr.269.1529564620071; Thu, 21 Jun 2018 00:03:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529564620; cv=none; d=google.com; s=arc-20160816; b=Cph2c192E4xVlqQ1o83JJRSZXAR+1j66mBJLnTHWVXOIyEHyDIkflDc8+s0qg/xRRv +wP/28CCmw6ZYE9LZFsk0O0UnwwY0GtqwI77ezIVfXYy6AcIqamyYtCLFdSCmfBa1SDJ I1VCQVla8js18DuLrCHv/O2adlCgHgSZHAw2LZtc9/xpMMc67MY7SjBWyven8J/epGOI HDFfH8hzwi3eRzV9DFa0ZcFFjCupmEL4Q7cn+MKsOZAigU2ClQKutY+BO14CV7iaGa51 C2c79gBefBcKmPZw7vEQjCNz/BkCDhtozQJKvC4jbgyn0+KnG84tbhJpiTA23m9V4JMa ClDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=szKF+gnXyFXIku5VW3IbELUbDP8o2QPq0Oibn8D+kV0=; b=HrXqlKh2Ad1gkalU3n06D69LOk6J+9J3DElDi+lLUjP91USpa80jt+ZlqvZyebEF6F 20W/JC9yvtHeYwJIu8kWFl+vcySe5IG35HNWag+eTnlbTs56M0F2IWd7zh92yzb4rVIU kINwI9Stx6HK8QWg9ztc53N9auVzo6EVu0dqKKXue5HzaZ1VCQ/e/8z1xMSwTJYR0Ezi 29CF46b/AV6vTxYKm43Fo8Nm3hoRlhj8IQFJ0spBgLkjmHMcdxTDNyE44BSWdJxAHHe0 q6c2wKPxR1SZUF92JjbJpJHtx/wbmBVoA4O+wPMCdMQybCkXwkrCAt3OVE1WZLhWKonR ewHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OMDpKF8F; spf=pass (google.com: domain of baijiaju1990@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=baijiaju1990@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id x17-v6sor1234097pfh.33.2018.06.21.00.03.39 for (Google Transport Security); Thu, 21 Jun 2018 00:03:40 -0700 (PDT) Received-SPF: pass (google.com: domain of baijiaju1990@gmail.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OMDpKF8F; spf=pass (google.com: domain of baijiaju1990@gmail.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=baijiaju1990@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=szKF+gnXyFXIku5VW3IbELUbDP8o2QPq0Oibn8D+kV0=; b=OMDpKF8FnmTzindIV3XU62gZHNXA6nApVy4lSfU/29dt5YV2YZV0SojHimfTeVnT/O ncyT1neuWXzqB4UX8qY9q9g11EpwMFCmsWSZHJ2MR8uec8Iy4Clv02S9fm/jTv5G2fb4 lNs5OXM7Xu45cOqkhTaZXsTyp+oTt5W6IaXri0lhKxKQP+phfc3hUJcTSH3LegGJzWaH 0KIQsUbzYLwJ64YyU8szK5MKx1jbypkTk4vjFx3/ljf3L/EZIEMgwy4dRuSjENh10Ojf AGskvifSuzDa2YBsncesI+6CzG1iEFVODmjXi6QZ+erXWOLYmn+AVX2PEuV87MKGXkrR a5nw== X-Google-Smtp-Source: ADUXVKKR5dsyFYEF0nX5/+tHzGdweS+hh1nnWXwkG4R+OfdEVhlASh+SI4n95WDFkGxLwSlYucM6Yw== X-Received: by 2002:a62:67c5:: with SMTP id t66-v6mr26293032pfj.20.1529564619802; Thu, 21 Jun 2018 00:03:39 -0700 (PDT) Received: from oslab.tsinghua.edu.cn ([2402:f000:1:4413:35c0:9e91:c7fc:672]) by smtp.gmail.com with ESMTPSA id u1-v6sm6053427pfn.59.2018.06.21.00.03.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Jun 2018 00:03:39 -0700 (PDT) From: Jia-Ju Bai To: akpm@linux-foundation.org, jthumshirn@suse.de, cl@linux.com, kstewart@linuxfoundation.org, pombredanne@nexb.com, gregkh@linuxfoundation.org, dvyukov@google.com Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Jia-Ju Bai Subject: [PATCH] mm: mempool: Remove unused argument in kasan_unpoison_element() and remove_element() Date: Thu, 21 Jun 2018 15:03:32 +0800 Message-Id: <20180621070332.16633-1-baijiaju1990@gmail.com> X-Mailer: git-send-email 2.17.0 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: X-Virus-Scanned: ClamAV using ClamSMTP The argument "gfp_t flags" is not used in kasan_unpoison_element() and remove_element(), so remove it. Signed-off-by: Jia-Ju Bai Reviewed-by: Matthew Wilcox Acked-by: Michal Hocko --- mm/mempool.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/mempool.c b/mm/mempool.c index 5c9dce34719b..3076ab3f7bc4 100644 --- a/mm/mempool.c +++ b/mm/mempool.c @@ -111,7 +111,7 @@ static __always_inline void kasan_poison_element(mempool_t *pool, void *element) kasan_free_pages(element, (unsigned long)pool->pool_data); } -static void kasan_unpoison_element(mempool_t *pool, void *element, gfp_t flags) +static void kasan_unpoison_element(mempool_t *pool, void *element) { if (pool->alloc == mempool_alloc_slab || pool->alloc == mempool_kmalloc) kasan_unpoison_slab(element); @@ -127,12 +127,12 @@ static __always_inline void add_element(mempool_t *pool, void *element) pool->elements[pool->curr_nr++] = element; } -static void *remove_element(mempool_t *pool, gfp_t flags) +static void *remove_element(mempool_t *pool) { void *element = pool->elements[--pool->curr_nr]; BUG_ON(pool->curr_nr < 0); - kasan_unpoison_element(pool, element, flags); + kasan_unpoison_element(pool, element); check_element(pool, element); return element; } @@ -151,7 +151,7 @@ void mempool_destroy(mempool_t *pool) return; while (pool->curr_nr) { - void *element = remove_element(pool, GFP_KERNEL); + void *element = remove_element(pool); pool->free(element, pool->pool_data); } kfree(pool->elements); @@ -247,7 +247,7 @@ int mempool_resize(mempool_t *pool, int new_min_nr) spin_lock_irqsave(&pool->lock, flags); if (new_min_nr <= pool->min_nr) { while (new_min_nr < pool->curr_nr) { - element = remove_element(pool, GFP_KERNEL); + element = remove_element(pool); spin_unlock_irqrestore(&pool->lock, flags); pool->free(element, pool->pool_data); spin_lock_irqsave(&pool->lock, flags); @@ -333,7 +333,7 @@ void *mempool_alloc(mempool_t *pool, gfp_t gfp_mask) spin_lock_irqsave(&pool->lock, flags); if (likely(pool->curr_nr)) { - element = remove_element(pool, gfp_temp); + element = remove_element(pool); spin_unlock_irqrestore(&pool->lock, flags); /* paired with rmb in mempool_free(), read comment there */ smp_wmb();