From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org List-ID: 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); -- 2.14.3