From patchwork Mon Jun 11 14:06:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10458001 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 2C18A601A0 for ; Mon, 11 Jun 2018 14:11:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C66C928734 for ; Mon, 11 Jun 2018 14:11:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3B7028761; Mon, 11 Jun 2018 14:11:17 +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=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 73ADC28762 for ; Mon, 11 Jun 2018 14:10:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65EA56B0297; Mon, 11 Jun 2018 10:07:09 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 613706B0299; Mon, 11 Jun 2018 10:07:09 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 466056B029A; Mon, 11 Jun 2018 10:07:09 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id EF35A6B0297 for ; Mon, 11 Jun 2018 10:07:08 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id 89-v6so12104506plb.18 for ; Mon, 11 Jun 2018 07:07:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=UgFl0dysXKDbf8W2SmP4EbGU6+EmivqudowCUQbLCL0=; b=IPRncWXnGNRUBII/nyq0Ce6S7Bt+fKObCT4GpC+foYy4qygW2obByIjEKsJf5bTLN4 DYchYv9XtGJPHQyHYdyPoEYTUrwnZEVEdcQ11/cafrafiFNLfqU0vA2wNX03UhejSHt2 1r6PXJKmWov9yw1VyJDgYkk7mg+hC5fIus3cCAsvHnm0AhL0mrhy9XwKCqnkzU+xfsWk wrgjDTPrYqueLuCTHQP5oNOtA9ji+Fu5aPxpW5ayyfjlphGFfrq5gRwtraj4N7VtuShs Sgz/MlOkftnX1xAwCZ2u+orBdpdWfbx7lEVx2+picMvhSWqjARCPTEQi7zkBUocabGd8 0pIg== X-Gm-Message-State: APt69E2KXs29P5Tzwm9R/EPK7Rprd6a4Cw/GgMYGetOmS2oO3/AbZpRC SR8eKrU/zGWSZZ2roZ22dbZXwWW6HiWij8k5yQHpcZlJ4/tlkFnJflgUfHA4VkXKW+R6YV7UHjr YWTdh7+go6L8Ss4pB2Oow0APpzeH+uZ5xMfHm8w3sLvY8b0Io9D6XoIQLKafPH33TIw== X-Received: by 2002:a63:6d05:: with SMTP id i5-v6mr15048040pgc.321.1528726028655; Mon, 11 Jun 2018 07:07:08 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKzK8FUMaFKvzlMnmFudghTAlISN1lXAMd0DyZBQMgSG7GrawLdDtHfFDQ6jnYlscne7V6D X-Received: by 2002:a63:6d05:: with SMTP id i5-v6mr15047984pgc.321.1528726027676; Mon, 11 Jun 2018 07:07:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528726027; cv=none; d=google.com; s=arc-20160816; b=ZdEVHYLeNtHkNjnpwE/ZxqGGyImVFDp2GgEmrdujj99fbMBhZAZXYmeFBh2Sw739MB 3Zz96RhiiJ0T2caI/VqyQJLk/HOCMNCTEJd4M7MtsUHBWTgDn6g0QfOOw43zYTeGol2t btdVlIOLEi8TZg8+ppEKzsYJ5PRfksIaGB2AUn1DOO/FVbu5Sr9dylMFnktAP4GY3x5g O8zyxs2FLgb9792QBWCxBIxxpbVWOOi0knNmd1MK7lz/uo9o5rXBRAm73UyetjWyiLde Odt8Ka1sm4RaxG3i7dX2GYIG+5VQVizaiB9vroKiztjRnpO6cneH/3Vgb7n30V1/CWrN ZDjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=UgFl0dysXKDbf8W2SmP4EbGU6+EmivqudowCUQbLCL0=; b=V+g8WJqn5whbgs01K6T92plLKIi4f1G9+zjR5D5IBUd7msCd6VcMvMCbGhCdbm9O2H 7vtBbCG1fztFzDDa+VL8AMVnW1nsaOgrqSxqiZl33NFkbY4SjqAybWiKCILvKJ1WM6/o nwqjPD/GVw3DJAO1hNJo3Sm16mr8YiPS0CdC2DrAtyoWJ47M14beiko/PZFf8VORAilJ Hzddfqu4m79ilzEXZyLLs6cVauwWoBenAvyZOyjefx2IGojefRYSm9yMBuuruDD2odjr 7oWwU20JhGI4ZC5qQx9R6IW1G4F9iTAR01yR7RenrFST2IsU/JtXwpB/TGG2XCA6TqFC tYPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=S1LKptTF; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id t7-v6si19636356pgv.668.2018.06.11.07.07.07 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 07:07:07 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=S1LKptTF; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org 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=UgFl0dysXKDbf8W2SmP4EbGU6+EmivqudowCUQbLCL0=; b=S1LKptTFb6IwBRg/HFYNOtO6s xvhJtCtRZZ/azdaRVrsVXBKxznY8NRzGqqPsxzoPcIMpgWcNGO7pCGmrSJPVpo4dy8tBWbejz0l6Y VYDcFR3PfrFZROAhODYJfzw3uvV6DaAd6MoPsXunHLLukqr8LCSD9+yfcEWMLTuO7niKodKCY+9lU 1Xv3Mw3lWkVdARbEiBYjYfV/pLnKM+0ssccRgRT+LLmxWjLfTe/YZofGJzhmPAw+zJahrprKdfIUq /Bl/g6MqmnFDZNRPCJuSuUibq3I5cq6ZXH6flRzvCuoRb0vyp0UOCTExJzauIo/8c8ean3HGkQRx0 r7QfT+jow==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSNTO-0004wc-TE; Mon, 11 Jun 2018 14:07:06 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v13 55/72] shmem: Comment fixups Date: Mon, 11 Jun 2018 07:06:22 -0700 Message-Id: <20180611140639.17215-56-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180611140639.17215-1-willy@infradead.org> References: <20180611140639.17215-1-willy@infradead.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox Remove the last mentions of radix tree from various comments. Signed-off-by: Matthew Wilcox --- mm/shmem.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index bffb87854852..5f14acf95eff 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -766,7 +766,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, @@ -1146,10 +1146,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 @@ -1215,7 +1215,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); @@ -1889,7 +1889,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; } @@ -2501,7 +2501,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)