Received: by 10.223.185.116 with SMTP id b49csp4138983wrg; Mon, 19 Feb 2018 11:52:46 -0800 (PST) X-Google-Smtp-Source: AH8x225/+og74KbbpziBIgA/D+lEONDl98OQ9mvu+Qh7z0d5HwVRdnpR1x5WMPV9uV/eZBvm676v X-Received: by 2002:a17:902:567:: with SMTP id 94-v6mr10536937plf.66.1519069966709; Mon, 19 Feb 2018 11:52:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519069966; cv=none; d=google.com; s=arc-20160816; b=yi6begE98BgRgXYtD8fWDF3AMF4wYCye5jtBvkLqkF7LTDZcQyiqr4burLcfiSaIWt tOSt1HoC1ZuvDJBvWMiMigoxAFLsbwEu1gV2ZZL7p6ZcpYSRG8PCOAN/YCJU2rOHxNtN ecoWTvnVJ40oqGDBUo8OguwSOD5NmqLTcrqOm/5p3C2/oydhtJ2piJrOUriTLftwyzML w/GNoaPsQwOwtGzWicQJ9iOlA158PgoemAHpmicLJk3nfE3n4AufMtHUS5LCuVDofGeF wr0DroHyas9Q6MoqZyCe3obMgk0W3Xj4Mqi2K8ix4KQ8Qhe+C6ephZhWYcITGGHUKQvB CP+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=pmjIf+fmfIM66eRNpl45O5bJ08h9KLQaynhOH+Tqo10=; b=Cn7oUnnG+XTlrrUY+t5Wm+iGcSw5xSBt45z426czPwNxr8GAGqOKQuX9FAd+4mxAn7 naL8pTzBtJg7noqZJ82ku1h5G/AjbAZPfSDVbZTELMCpO2CoRL7u3Gs+IKxJekGB12B1 Urrx6OD9WKsQwGGFW6DC+pyBJtX6w9RQTAmkrtljSXH9lhAEGnajmcGIiHdt9Cama+kb W4ccAuJwK0h+4sV6blQfPhQv/edpsGmuHUAkvEMeg2a4RMG7VzHixPzz7TweYQYs8+0z wwKe4CyAbOWPAyD8p1CJsOWj4UBWMtPqvflmHgP9MWAarQRiHzTWp0rzkoq+YZJH+eX+ O42A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=j1sX8trY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p8-v6si10883180plk.192.2018.02.19.11.52.32; Mon, 19 Feb 2018 11:52:46 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=j1sX8trY; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932125AbeBSTtl (ORCPT + 99 others); Mon, 19 Feb 2018 14:49:41 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:45038 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753720AbeBSTq3 (ORCPT ); Mon, 19 Feb 2018 14:46:29 -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=pmjIf+fmfIM66eRNpl45O5bJ08h9KLQaynhOH+Tqo10=; b=j1sX8trYHNFI0TTmD6weQeIGq HmeVfkH2MuGzdRGPFqUR+G3gatZIbBvLZQ3RVvkUXD5xyW8kNNuG5Rs6HCr2OvmlSKdoDIH7verHt /iiiblCNV7IrX9XVczMaYIm+nTFqYrMixkHzfrw1hhsERAblDkjkrHhRczC7qHqal5u5jKyxgCjqM xCfRgGXKQKbf+IR+9nGiJuNDZNmrpaHiOCrMQSGdCs5ogTyZUJ9Fi/z0K5YivBP/Wm+ICLFWj15wc TdbZMoYIC9eQQYxNT93I3d6fRgeBUOclqDWrEE0BfO8n/WW0C06PR/FMujVLuaTdx35X2NoRH+ADS hZTPHrpuw==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOO-0001wK-LS; Mon, 19 Feb 2018 19:46:28 +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 53/61] shmem: Comment fixups Date: Mon, 19 Feb 2018 11:45:48 -0800 Message-Id: <20180219194556.6575-54-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 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Matthew Wilcox Remove the last mentions of radix tree from various comments. Signed-off-by: Matthew Wilcox --- mm/shmem.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index c24c4cb76c43..68aeff336822 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -743,7 +743,7 @@ void shmem_unlock_mapping(struct address_space *mapping) } /* - * Remove range of pages and swap entries from radix tree, and free them. + * Remove range of pages and swap entries from page cache, and free them. * If !unfalloc, truncate or punch hole; if unfalloc, undo failed fallocate. */ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend, @@ -1118,10 +1118,10 @@ static int shmem_unuse_inode(struct shmem_inode_info *info, * We needed to drop mutex to make that restrictive page * allocation, but the inode might have been freed while we * dropped it: although a racing shmem_evict_inode() cannot - * complete without emptying the radix_tree, our page lock + * complete without emptying the page cache, our page lock * on this swapcache page is not enough to prevent that - * free_swap_and_cache() of our swap entry will only - * trylock_page(), removing swap from radix_tree whatever. + * trylock_page(), removing swap from page cache whatever. * * We must not proceed to shmem_add_to_page_cache() if the * inode has been freed, but of course we cannot rely on @@ -1187,7 +1187,7 @@ int shmem_unuse(swp_entry_t swap, struct page *page) false); if (error) goto out; - /* No radix_tree_preload: swap entry keeps a place for page in tree */ + /* No memory allocation: swap entry occupies the slot for the page */ error = -EAGAIN; mutex_lock(&shmem_swaplist_mutex); @@ -1863,7 +1863,7 @@ alloc_nohuge: page = shmem_alloc_and_acct_page(gfp, inode, spin_unlock_irq(&info->lock); goto repeat; } - if (error == -EEXIST) /* from above or from radix_tree_insert */ + if (error == -EEXIST) goto repeat; return error; } @@ -2475,7 +2475,7 @@ static ssize_t shmem_file_read_iter(struct kiocb *iocb, struct iov_iter *to) } /* - * llseek SEEK_DATA or SEEK_HOLE through the radix_tree. + * llseek SEEK_DATA or SEEK_HOLE through the page cache. */ static pgoff_t shmem_seek_hole_data(struct address_space *mapping, pgoff_t index, pgoff_t end, int whence) @@ -2563,7 +2563,7 @@ static loff_t shmem_file_llseek(struct file *file, loff_t offset, int whence) } /* - * We need a tag: a new tag would expand every radix_tree_node by 8 bytes, + * We need a tag: a new tag would expand every xa_node by 8 bytes, * so reuse a tag which we firmly believe is never set or cleared on shmem. */ #define SHMEM_TAG_PINNED PAGECACHE_TAG_TOWRITE -- 2.16.1