From patchwork Mon Feb 19 19:45:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10228725 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 D527F602B7 for ; Mon, 19 Feb 2018 19:59:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C7CC028B86 for ; Mon, 19 Feb 2018 19:59:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BCBF728B8A; Mon, 19 Feb 2018 19:59:34 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 6FDD228B86 for ; Mon, 19 Feb 2018 19:59:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753905AbeBST5C (ORCPT ); Mon, 19 Feb 2018 14:57:02 -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 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To: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:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=S38F5zJ8iUJHb4zYxKS9+drgIRbRT3fQITIxvzXxgkY=; b=DDXTdk9Z22nwbpxK6h7zt1AdI l2zz+0apFrzUFoefk5WZCqW0dOf+WRK/qFFH4JqZEv9vVZfiPhCZ701jWAjAvjIk94E6AmuiStdGs 2xf6qwzo5snA+CqXyeJmG//ks5oSoNJMrQRJeg7s58ncoGwWIe2mwYH4bV32YBsCwVqUEk0rYUFD9 G4OyGYv+L8g94eMxZwDZ0sCQJOQnip+FZRn56t7SVGC6G5/+Or/f2H/AeeVILIR0OI3eVeq4jaq4q /DZdbwx2iJyzSTPIjkNy+yHdOLWBzTnF3rxAwfK/7D5MmnvI6QiBpP8rEDBLAK9fEu+rvP47vMob4 soiPuALoA==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOD-0001pZ-Ek; Mon, 19 Feb 2018 19:46:17 +0000 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-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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);