From patchwork Wed Apr 4 19:18:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jerome Glisse X-Patchwork-Id: 10323159 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 8CFA860467 for ; Wed, 4 Apr 2018 19:24:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D48528EA8 for ; Wed, 4 Apr 2018 19:24:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6FC1228F4C; Wed, 4 Apr 2018 19:24:18 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEA7C28EA8 for ; Wed, 4 Apr 2018 19:24:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752431AbeDDTYB (ORCPT ); Wed, 4 Apr 2018 15:24:01 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:49488 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752075AbeDDTT0 (ORCPT ); Wed, 4 Apr 2018 15:19:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 19193401DEA6; Wed, 4 Apr 2018 19:19:26 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-125-89.rdu2.redhat.com [10.10.125.89]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5069C94580; Wed, 4 Apr 2018 19:19:25 +0000 (UTC) From: jglisse@redhat.com To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Andrew Morton , Alexander Viro , Jens Axboe , Tejun Heo , Jan Kara , Josef Bacik , Mel Gorman Subject: [RFC PATCH 64/79] mm/buffer: use _page_has_buffers() instead of page_has_buffers() Date: Wed, 4 Apr 2018 15:18:18 -0400 Message-Id: <20180404191831.5378-29-jglisse@redhat.com> In-Reply-To: <20180404191831.5378-1-jglisse@redhat.com> References: <20180404191831.5378-1-jglisse@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 04 Apr 2018 19:19:26 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Wed, 04 Apr 2018 19:19:26 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'jglisse@redhat.com' RCPT:'' Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jérôme Glisse The former need the address_space for which the buffer_head is being lookup. ---------------------------------------------------------------------- @exists@ identifier M; expression E; @@ struct address_space *M; ... -page_buffers(E) +_page_buffers(E, M) @exists@ identifier M, F; expression E; @@ F(..., struct address_space *M, ...) {... -page_buffers(E) +_page_buffers(E, M) ...} @exists@ identifier M; expression E; @@ struct address_space *M; ... -page_has_buffers(E) +_page_has_buffers(E, M) @exists@ identifier M, F; expression E; @@ F(..., struct address_space *M, ...) {... -page_has_buffers(E) +_page_has_buffers(E, M) ...} @exists@ identifier I; expression E; @@ struct inode *I; ... -page_buffers(E) +_page_buffers(E, I->i_mapping) @exists@ identifier I, F; expression E; @@ F(..., struct inode *I, ...) {... -page_buffers(E) +_page_buffers(E, I->i_mapping) ...} @exists@ identifier I; expression E; @@ struct inode *I; ... -page_has_buffers(E) +_page_has_buffers(E, I->i_mapping) @exists@ identifier I, F; expression E; @@ F(..., struct inode *I, ...) {... -page_has_buffers(E) +_page_has_buffers(E, I->i_mapping) ...} ---------------------------------------------------------------------- Signed-off-by: Jérôme Glisse CC: Andrew Morton Cc: Alexander Viro Cc: linux-fsdevel@vger.kernel.org Cc: Jens Axboe Cc: Tejun Heo Cc: Jan Kara Cc: Josef Bacik Cc: Mel Gorman --- mm/migrate.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/migrate.c b/mm/migrate.c index c2a613283fa2..e4b20ac6cf36 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -768,10 +768,10 @@ int buffer_migrate_page(struct address_space *mapping, struct buffer_head *bh, *head; int rc; - if (!page_has_buffers(page)) + if (!_page_has_buffers(page, mapping)) return migrate_page(mapping, newpage, page, mode); - head = page_buffers(page); + head = _page_buffers(page, mapping); rc = migrate_page_move_mapping(mapping, newpage, page, head, mode, 0);