From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v5 50/78] shmem: Convert shmem_partial_swap_usage to XArray Date: Fri, 15 Dec 2017 14:04:22 -0800 Message-ID: <20171215220450.7899-51-willy@infradead.org> References: <20171215220450.7899-1-willy@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; 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=iG44ap0ocZrbdP72gCov45nVEezyshoeoQcvsJ/3YwU=; b=kg9eCJwtQNMaUNvvlMtHfjQn54 d0oZIiVfbpSCzUh+u/i3LNqkTiVbMpwAd02qeJSC7U/F8i5p6UFx5dbu6kG7eRX0CZ7Z7LcDWQgDa qbdszmodyhPV+ETDRExo9H0LTZ2t+cB8qR4QK3zyNQ8keJSTSDiDrqNdf1rkSDxKjHFM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; 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=iG44ap0ocZrbdP72gCov45nVEezyshoeoQcvsJ/3YwU=; b=h3YXlXpWbfgEKxmUaPZ+75fYpI sVoRNcRkNcq+jcX0+3A5reKdEerHobQtSMD7yr2hnw4kI6SJgGYq539YnGvlJ1+32GSxPLnVq4XT7 lhbUFMyG0t5IEliCV7a2rlsVbubJQGOFCm5fuCCEBlKzzgtZx1KMlg4WXBrW2jXWWPws=; 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=iG44ap0ocZrbdP72gCov45nVEezyshoeoQcvsJ/3YwU=; b=ksI4ZXdoSvl23FCJETLfR/o/5 3UpRaqoTlLg3Xi1RsV8MvSBMyfccu3kXkLkD1a9B1RMBcFLz2jlUgxbfnQ8t+XDJBJZJ1typo14OB VSy4pALPgcc/B6fYxFl8k7aYbsCAMzrKq4F/5tIPo/RH08He6gDqje6pJfA7/1Yt0RjUJHYYGs4+A dhDPHmUunktwzFwzviWDIFI1QA7LnNiacWMRopkkQxHcLeXfMPKE3wpwWsRb1/UQ0YE/JOXVvee1E +7NIJKX39mNInWYCKuojkHGK7H65LDLQzYBq0WmN2RNEO95hhU7XKGBWSonRnGEbX8QChDF0RsgxX vcGLWWXAw==; In-Reply-To: <20171215220450.7899-1-willy@infradead.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: linux-kernel@vger.kernel.org Cc: Jens Axboe , linux-xfs@vger.kernel.org, linux-nilfs@vger.kernel.org, linux-raid@vger.kernel.org, Matthew Wilcox , Marc Zyngier , linux-usb@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, David Howells , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ross Zwisler , Rehas Sachdeva , Shaohua Li , linux-btrfs@vger.kernel.org From: Matthew Wilcox Simpler code because the xarray takes care of things like the limit and dereferencing the slot. Signed-off-by: Matthew Wilcox --- mm/shmem.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index dd663341e01e..ecf05645509b 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -658,29 +658,17 @@ static int shmem_free_swap(struct address_space *mapping, unsigned long shmem_partial_swap_usage(struct address_space *mapping, pgoff_t start, pgoff_t end) { - struct radix_tree_iter iter; - void **slot; + XA_STATE(xas, &mapping->pages, start); struct page *page; unsigned long swapped = 0; rcu_read_lock(); - - radix_tree_for_each_slot(slot, &mapping->pages, &iter, start) { - if (iter.index >= end) - break; - - page = radix_tree_deref_slot(slot); - - if (radix_tree_deref_retry(page)) { - slot = radix_tree_iter_retry(&iter); - continue; - } - + xas_for_each(&xas, page, end - 1) { if (xa_is_value(page)) swapped++; if (need_resched()) { - slot = radix_tree_iter_resume(slot, &iter); + xas_pause(&xas); cond_resched_rcu(); } } -- 2.15.1 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot