From patchwork Fri Jan 4 03:25:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10748015 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6377391E for ; Fri, 4 Jan 2019 03:26:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A7F6205F7 for ; Fri, 4 Jan 2019 03:26:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3E8D926247; Fri, 4 Jan 2019 03:26:07 +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=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 C5A63205F7 for ; Fri, 4 Jan 2019 03:26:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3CEAB8E00BB; Thu, 3 Jan 2019 22:26:05 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 37EB88E00AE; Thu, 3 Jan 2019 22:26:05 -0500 (EST) 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 249078E00BB; Thu, 3 Jan 2019 22:26:05 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id D54418E00AE for ; Thu, 3 Jan 2019 22:26:04 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id r9so36214980pfb.13 for ; Thu, 03 Jan 2019 19:26:04 -0800 (PST) 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=TUru1HHx8q0V6/xOBzSMBaM9Fpo1sQPDtPFSXInsbxs=; b=OGrtDP8KHUfwdg4EvICB2kCv+eWzR2AOvAy+nQyuptiNi0HqZh19Gu1jMxhWldNiOh hjl0RZ/x27NbqNvSkx4v4+YUyfdxlv4IK7C6lK/v3xKw+VIJ7faZWCeZVaCPrtPurtA/ jsDv/GmFZKS89A9nmKmrthGwQFk4B97b9nWwZfidfKy85uvA3W7C3dE8baQMfq6wYnNF eUykJDwBwQdH8mDzvh5hncXD3B4704GJX+0HMQvsvyQDVfwknFngEw2qINuen+kp6XUM hiBhWXIcJSWQz9UHevLBF0KNlgyixtKC3ah0be2TKnV5ayWBzozvYsdJEtxZgz/H4yIs ItTA== X-Gm-Message-State: AJcUukf0mNkDaAsZyOZ8QnuxVUdp2PFUqi0YEwHMht3VFUXw3Y499AXr XYgQV12mqrDIl0hY29EXOV1SsWMtD6rOArhsk471zKuLFKCD+2gj0SHrG+61fbBk49VKur3nHzJ 0wWBbz0hfIzwqstFDQXdljosk2k6j21wSUENnSEtvTne4hjo+MWXyce31NzHHx6dBYA== X-Received: by 2002:a62:3adc:: with SMTP id v89mr6150431pfj.109.1546572364010; Thu, 03 Jan 2019 19:26:04 -0800 (PST) X-Google-Smtp-Source: ALg8bN4poD4oBFhyJlN6o7AB+uDT1gAki9Z4C0j0YBVaNOb6wWv8A7ZSiNHV0bbooFfgJNv0tU5z X-Received: by 2002:a62:3adc:: with SMTP id v89mr6150399pfj.109.1546572362956; Thu, 03 Jan 2019 19:26:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546572362; cv=none; d=google.com; s=arc-20160816; b=ZmBgsuzPr4YAICMV64v19bnR8ODvGE3bOTHzK61iFe27xjyt30MOLR0cph5c36Fg2N cMCrGntQegbX1TN0lkVN1NKoBWkLS10jo3GPE+rnU/RAwDxtorSS65gLUPxDgH0vnN9d EUOjJ6QNwhxNELsNjOUAuMvqI9wuEYc/dLbQENg+6HEzvDKK/pGdPtiNRqxD+FAuZXwS w5tAKEVb7Bu0sp3Cn2PaJ/KFjbOxIPOS+ac6qzwCbS6udirAL/cQ9sAuVfE0ggeabaR+ oikj4AHfWBZbCrTble8FHkwHJmlMaSqZp6jV1qrKB7VZmRPsK/zFXXDtfnuQ0WeFGLcq m/tw== 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; bh=TUru1HHx8q0V6/xOBzSMBaM9Fpo1sQPDtPFSXInsbxs=; b=d9Kgv9aU1djWMXl7Y9BaxV52folCXZmFNREyFF7jMXM6jBGsI9Vq2yzydhc4mbd/Sw WpCWMdYqutniG5HvVa18541oS8jt6QO6ETV1ECTp7AgYUYVIde8WeACLHCJTWuni+gzd 9/fWZ028U/FVEHUMp2PkQEUx3j8mgzKuRq66SO0uze4bsv9qiIUZ6JTgMA7pt/1LblgA yQf99Q3CdgCTdmEvG0h8SKad9AMN7trAlY8lixehGc46HTuJ336JbsspiPSek7VLjpZ1 6wMWBh8qYZNW0QsuOCgheEj1Qat/BCi9yV204fg0ooiOScJqOug6avGt9FSudegjvmwe vYvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=brl9Wvoc; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id q26si53808272pgk.162.2019.01.03.19.26.02 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Jan 2019 19:26:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=brl9Wvoc; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=TUru1HHx8q0V6/xOBzSMBaM9Fpo1sQPDtPFSXInsbxs=; b=brl9WvocTMxujZs+/wiKnlqVw 5hN7hGrxlm+XrxbpwKt66Ulaf1pbe7J8UzOjTfV+KOk+gYHi0QFVjNfPvYEp5ZPgaxvJ4AbZA4tGc NpK9+FHABh0pmwpzhrvqnXmPI7bEQgNNfLXIX4GI2+xvA9VxFVXJuIevWdp6RipaDqFabswBF0ew1 26tPqIMf2lweRUo/YbIiMVLvMS/ZZYDysmlfZtaP6aJ/z3dOYqv1QzVcRAA6bH4WPZOmMJYbNTP1A 9z/zf0oilaI0HYc0zjfNWinl72bOuuanAa2N5j9MdWVAZ75aoFM1A6EkKwuPxZ/CtY3zPqSqVi1iE za06+Y1Uw==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1gfG7U-0000pF-2e; Fri, 04 Jan 2019 03:26:00 +0000 From: Matthew Wilcox To: Andrew Morton , linux-mm@kvack.org, Aditya Pakki , Mel Gorman Cc: Matthew Wilcox Subject: [PATCH] mm: Remove sysctl_extfrag_handler Date: Thu, 3 Jan 2019 19:25:57 -0800 Message-Id: <20190104032557.3056-1-willy@infradead.org> X-Mailer: git-send-email 2.14.5 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 sysctl_extfrag_handler function neglects to propagate the return value from proc_dointvec_minmax() to its caller. It's a wrapper that doesn't need to exist, so just use proc_dointvec_minmax directly. Reported-by: Aditya Pakki Signed-off-by: Matthew Wilcox Acked-by: Mel Gorman Acked-by: Randy Dunlap --- include/linux/compaction.h | 2 -- kernel/sysctl.c | 2 +- mm/compaction.c | 8 -------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/include/linux/compaction.h b/include/linux/compaction.h index 68250a57aace..70d0256edd31 100644 --- a/include/linux/compaction.h +++ b/include/linux/compaction.h @@ -88,8 +88,6 @@ extern int sysctl_compact_memory; extern int sysctl_compaction_handler(struct ctl_table *table, int write, void __user *buffer, size_t *length, loff_t *ppos); extern int sysctl_extfrag_threshold; -extern int sysctl_extfrag_handler(struct ctl_table *table, int write, - void __user *buffer, size_t *length, loff_t *ppos); extern int sysctl_compact_unevictable_allowed; extern int fragmentation_index(struct zone *zone, unsigned int order); diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 5fc724e4e454..e9c69247fc29 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -1439,7 +1439,7 @@ static struct ctl_table vm_table[] = { .data = &sysctl_extfrag_threshold, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = sysctl_extfrag_handler, + .proc_handler = proc_dointvec_minmax, .extra1 = &min_extfrag_threshold, .extra2 = &max_extfrag_threshold, }, diff --git a/mm/compaction.c b/mm/compaction.c index 7c607479de4a..80b941d9b6e7 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -1876,14 +1876,6 @@ int sysctl_compaction_handler(struct ctl_table *table, int write, return 0; } -int sysctl_extfrag_handler(struct ctl_table *table, int write, - void __user *buffer, size_t *length, loff_t *ppos) -{ - proc_dointvec_minmax(table, write, buffer, length, ppos); - - return 0; -} - #if defined(CONFIG_SYSFS) && defined(CONFIG_NUMA) static ssize_t sysfs_compact_node(struct device *dev, struct device_attribute *attr,