From patchwork Tue Dec 11 17:21:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 10724269 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 B594C112E for ; Tue, 11 Dec 2018 17:22:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9724A2B553 for ; Tue, 11 Dec 2018 17:22:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B7622B561; Tue, 11 Dec 2018 17:22:06 +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.9 required=2.0 tests=BAYES_00,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 0EF3E2B553 for ; Tue, 11 Dec 2018 17:22:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7BBA8E00BA; Tue, 11 Dec 2018 12:21:53 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9B0858E00B5; Tue, 11 Dec 2018 12:21:53 -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 8512D8E00BA; Tue, 11 Dec 2018 12:21:53 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by kanga.kvack.org (Postfix) with ESMTP id 360728E00B5 for ; Tue, 11 Dec 2018 12:21:53 -0500 (EST) Received: by mail-pl1-f198.google.com with SMTP id b24so6931420pls.11 for ; Tue, 11 Dec 2018 09:21:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=INRYCEL6vCtvMfVy1XV6+7WZ8+Bl536OsWF1QZwcibU=; b=cBHlpNi1Y76j/cR7x9g2fnkj+P2ir8dV7C7AHzaRukDfZxhOtw8jfEVpvNsql6yEIc 7ulxzgMn2/3gDQbiNzUSDo8w8cQlA8riOY5n57fY44U8u7L9gEAcc+t2+c+/FvOn/SJt jxpoDxL+2S/xoDJCh/m5xQKEwbC25zG8lT5xQCjJpCqklrVL9uOdlg4LP0OLCrLhnNtw PgpWUsXj9RynMDF98L4cIQd/YmSHgJM45xBJ11ppFFxXieasb5mYhXKfITYg6M5VUpUy RJqujrmg2aQleJTEmnX/IMTjz/7guCoAfNkEp6AEikG3iLgNqYQO4rvfJ6UC0hZ4/zFE vL1A== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz X-Gm-Message-State: AA+aEWbiWjopHwGOapbLilxrOO9POK5qO8v9MfeiKeAcfgIK7Em2/nGs +/mdT4OCUJlwKwS8uNCraUjgLar4D6+NliJ8JygfRmDsdQ14vGs8ZHOECS8ke6pEMDY44pbWz5s s/6sNSn3zRzsgSvTUP5G5i/gr9HIu30BA8KCQ/Gv0MQboYOiOjoSbuJih0uUMKZcRuA== X-Received: by 2002:a62:2b8b:: with SMTP id r133mr17098017pfr.246.1544548912862; Tue, 11 Dec 2018 09:21:52 -0800 (PST) X-Google-Smtp-Source: AFSGD/WKtK1kde+VtQlhJtBBIK9cpwpDWowjttKn30e3qdrIpm4Hdvd+gVl3EhRzp4lud5PhOIU+ X-Received: by 2002:a62:2b8b:: with SMTP id r133mr17097965pfr.246.1544548911995; Tue, 11 Dec 2018 09:21:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544548911; cv=none; d=google.com; s=arc-20160816; b=zgxY0VN+DNn3U59yIEjZyVANqbdGuTYkJHjVwcvU1F1ysFJmWJxQiC+hDqrrK40tE0 rHy6Sn4EWiUO/ZCXpS4i4e5+T79XbaNMMEPQDLnQibwsENtmW3XfFUzFw6EY8ipZYvOk zvMDZLbJwXcM+mqSLCsU5iqf6NqHKdCQxgenf8QRd4HioGqljLhygEY9RaAzsRERoNi0 Rbwk5o83mVniAbS2eHWivxLHMf6AZRzM8YGft/RQ1echZKwbYGhyTcltUgI27fJyw4oj Hey4ygn4nKzMOqd1FkfGyUQsnO7MgqS1CaxvrXpEL+9FF3LUnUelkwew0OFQLqv+dL5m 86og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from; bh=INRYCEL6vCtvMfVy1XV6+7WZ8+Bl536OsWF1QZwcibU=; b=IzxgreHGly++3rMz/o3XtlpNsYWSRQYorGpxC2pfk+9MaWZSLA6MuN4uxFU+IUR3KK FfwjPRmxu5DzDNrzLPven0BTSvYUEe+VpZ/3jl9iFSVqj8a/clO8wOTRAhobNXfRk7ZI 5b4LfHzXGGYSyB6vL7ti6HsjIoedPQNiH4GuH55IBf9XiEJ4l1J5HeGFRipgjcWkpZtI DT8ys7psOoRvFFwFLuckLRjpLWM9aSZv3rKmoeAtaXs4m/nZi5YiNFGE4iVqwrDWFSdW ejV7kEQeQR6VS5UWUrHa4hIfLNuH75JsobmDZZwQhkgyBg8tsqE/Uta0T7hvL4/k0IQ4 QLjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz Received: from mx1.suse.de (mx2.suse.de. [195.135.220.15]) by mx.google.com with ESMTPS id m64si14303764pfb.224.2018.12.11.09.21.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Dec 2018 09:21:51 -0800 (PST) Received-SPF: pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) client-ip=195.135.220.15; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jack@suse.cz designates 195.135.220.15 as permitted sender) smtp.mailfrom=jack@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 21733B042 for ; Tue, 11 Dec 2018 17:21:49 +0000 (UTC) Received: by quack2.suse.cz (Postfix, from userid 1000) id 710631E1430; Tue, 11 Dec 2018 18:21:48 +0100 (CET) From: Jan Kara To: Cc: mhocko@suse.cz, mgorman@suse.de, Jan Kara Subject: [PATCH 6/6] mm: migrate: Drop unused argument of migrate_page_move_mapping() Date: Tue, 11 Dec 2018 18:21:43 +0100 Message-Id: <20181211172143.7358-7-jack@suse.cz> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20181211172143.7358-1-jack@suse.cz> References: <20181211172143.7358-1-jack@suse.cz> 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 All callers of migrate_page_move_mapping() now pass NULL for 'head' argument. Drop it. Signed-off-by: Jan Kara Acked-by: Mel Gorman --- fs/aio.c | 2 +- fs/f2fs/data.c | 2 +- fs/iomap.c | 2 +- fs/ubifs/file.c | 2 +- include/linux/migrate.h | 3 +-- mm/migrate.c | 7 +++---- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/fs/aio.c b/fs/aio.c index 97f983592925..4f4878ebca9a 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -408,7 +408,7 @@ static int aio_migratepage(struct address_space *mapping, struct page *new, BUG_ON(PageWriteback(old)); get_page(new); - rc = migrate_page_move_mapping(mapping, new, old, NULL, mode, 1); + rc = migrate_page_move_mapping(mapping, new, old, mode, 1); if (rc != MIGRATEPAGE_SUCCESS) { put_page(new); goto out_unlock; diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index b293cb3e27a2..008b74eff00d 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2738,7 +2738,7 @@ int f2fs_migrate_page(struct address_space *mapping, */ extra_count = (atomic_written ? 1 : 0) - page_has_private(page); rc = migrate_page_move_mapping(mapping, newpage, - page, NULL, mode, extra_count); + page, mode, extra_count); if (rc != MIGRATEPAGE_SUCCESS) { if (atomic_written) mutex_unlock(&fi->inmem_lock); diff --git a/fs/iomap.c b/fs/iomap.c index 3ffb776fbebe..8df6a75d2d11 100644 --- a/fs/iomap.c +++ b/fs/iomap.c @@ -550,7 +550,7 @@ iomap_migrate_page(struct address_space *mapping, struct page *newpage, { int ret; - ret = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); + ret = migrate_page_move_mapping(mapping, newpage, page, mode, 0); if (ret != MIGRATEPAGE_SUCCESS) return ret; diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 1b78f2e09218..5d2ffb1a45fc 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1481,7 +1481,7 @@ static int ubifs_migrate_page(struct address_space *mapping, { int rc; - rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); + rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0); if (rc != MIGRATEPAGE_SUCCESS) return rc; diff --git a/include/linux/migrate.h b/include/linux/migrate.h index f2b4abbca55e..8eeeaf946f95 100644 --- a/include/linux/migrate.h +++ b/include/linux/migrate.h @@ -77,8 +77,7 @@ extern void migrate_page_copy(struct page *newpage, struct page *page); extern int migrate_huge_page_move_mapping(struct address_space *mapping, struct page *newpage, struct page *page); extern int migrate_page_move_mapping(struct address_space *mapping, - struct page *newpage, struct page *page, - struct buffer_head *head, enum migrate_mode mode, + struct page *newpage, struct page *page, enum migrate_mode mode, int extra_count); #else diff --git a/mm/migrate.c b/mm/migrate.c index c4075d5ec073..1e47ea88a5b3 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -403,8 +403,7 @@ static int expected_page_refs(struct page *page) * 3 for pages with a mapping and PagePrivate/PagePrivate2 set. */ int migrate_page_move_mapping(struct address_space *mapping, - struct page *newpage, struct page *page, - struct buffer_head *head, enum migrate_mode mode, + struct page *newpage, struct page *page, enum migrate_mode mode, int extra_count) { XA_STATE(xas, &mapping->i_pages, page_index(page)); @@ -691,7 +690,7 @@ int migrate_page(struct address_space *mapping, BUG_ON(PageWriteback(page)); /* Writeback must be complete */ - rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); + rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0); if (rc != MIGRATEPAGE_SUCCESS) return rc; @@ -794,7 +793,7 @@ static int __buffer_migrate_page(struct address_space *mapping, } } - rc = migrate_page_move_mapping(mapping, newpage, page, NULL, mode, 0); + rc = migrate_page_move_mapping(mapping, newpage, page, mode, 0); if (rc != MIGRATEPAGE_SUCCESS) goto unlock_buffers;