From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754010AbeBST5F (ORCPT ); Mon, 19 Feb 2018 14:57:05 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:44792 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753715AbeBSTqS (ORCPT ); Mon, 19 Feb 2018 14:46:18 -0500 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v7 32/61] page cache: Convert filemap_range_has_page to XArray Date: Mon, 19 Feb 2018 11:45:27 -0800 Message-Id: <20180219194556.6575-33-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219194556.6575-1-willy@infradead.org> References: <20180219194556.6575-1-willy@infradead.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox Instead of calling find_get_pages_range() and putting any reference, just use xa_find() to look for a page in the right range. Signed-off-by: Matthew Wilcox --- mm/filemap.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 3735ea6e3d19..a02d69a957e4 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -460,18 +460,11 @@ bool filemap_range_has_page(struct address_space *mapping, { pgoff_t index = start_byte >> PAGE_SHIFT; pgoff_t end = end_byte >> PAGE_SHIFT; - struct page *page; if (end_byte < start_byte) return false; - if (mapping->nrpages == 0) - return false; - - if (!find_get_pages_range(mapping, &index, end, 1, &page)) - return false; - put_page(page); - return true; + return xa_find(&mapping->pages, &index, end, XA_PRESENT); } EXPORT_SYMBOL(filemap_range_has_page); -- 2.16.1