Received: by 10.213.65.68 with SMTP id h4csp352568imn; Tue, 13 Mar 2018 06:32:14 -0700 (PDT) X-Google-Smtp-Source: AG47ELvb/lbALvGRi1hHPVBznM1pjhcF4X7knQXo1v2wGrzPFgYORuuZzx6OmpzchmI5x5SkhtSz X-Received: by 10.98.166.85 with SMTP id t82mr606899pfe.237.1520947934422; Tue, 13 Mar 2018 06:32:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520947934; cv=none; d=google.com; s=arc-20160816; b=XWL2USKTHeIciMOHzVR03yj25FJB917GXKGGHs/LQyI8xtcGZekmvNlV/i13venUH4 GYRQawICjM+jEajxuRdD1mZrXv1ywPxBwwlDoTDy072KN6esmNRTruRNCePT+IhEv6wb tObv/9Oy403JbrVBq9MPklHS4moWijq+Yh4jq4dlNGnSxGPlQFykeLd5ocU1JBspO1Y3 beWElkrrm1qCuBykAtKvNCpisosC7kcuo48P6hf8Nd4Ra+xu/LLLjr/lswxOE32LQy7m Sm6axWcZjKqG11s7Zs4iAoP1UrhAkux6PIqCMYpFl1FRNL7M8Q0PnWiJ6cb92bwbntvI /XYA== 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=TOQIcEGLd9uWoqlAYOTm/Gwp0H1LSs5uFWv1aD+804c=; b=gez1llWIypY3jAGh+zvq9dTYNg+S492/8EYeHmWgadkVsqqyWM2b/4D6+L2M26wQkZ S8po24P+KkbunxJCB57CUHZiBhHvLRzfXXiou0PXIgFq+hCtWqk1kpBA8IbZ1V8H84ii HiEaKijjc0woOEXtgdKu6TOIW7LP3HL/sZHpZaejphOK00ItvTfszEZvEOiuPTc6Plo4 8wtztG9tMkNbUu0bDwCnBV4eF5JyUhO5V6Qqp/ppX5aKILrJFl0rLlHnOFhbr8BD6HOP oCN2QkJauG88oazcaVgj9i8roaoasbOk5xOf2vfTRIXNzL+dGJ5jeCCv3lYsH5PmHs4X slpg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=PS9DZCSg; 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 g11si125985pgf.5.2018.03.13.06.31.59; Tue, 13 Mar 2018 06:32:14 -0700 (PDT) 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=PS9DZCSg; 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 S932960AbeCMNaX (ORCPT + 99 others); Tue, 13 Mar 2018 09:30:23 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:35594 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932680AbeCMN1H (ORCPT ); Tue, 13 Mar 2018 09:27:07 -0400 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=TOQIcEGLd9uWoqlAYOTm/Gwp0H1LSs5uFWv1aD+804c=; b=PS9DZCSgJwsjzf4yKBvV9MLRC cWZVsxW4Xxy3hNJrysIiD/7d/V6gh9Qbh9ThsqhgZ2KP16XOiqzrXSqAFDOeOQSFsM47pN3x45hxZ j6hDIx8yQFoRYQ77Hes5OgjnsDUdwejW7lO7XHZCHDCV7FovILl/HcafTIgNPA9tTD4otgUnnaF/S +4+b9f8V4IpkOZXs8VJRjNjnSoX8zsTt7EfSZ5kTjg88to+LN7grRDfCC/oCPbvjtzmjpeeJK8vfy x2Z5VY/QdCnmhf/eQgOHjUY5CzJO4mh+JnJe8FDZfHujQYkEXXlB0bTsQGqTFWrCOeEpd7V8Wd2G+ In04RRBBg==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1evjxJ-0004me-Q7; Tue, 13 Mar 2018 13:27:05 +0000 From: Matthew Wilcox To: Andrew Morton Cc: Matthew Wilcox , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ryusuke Konishi , linux-nilfs@vger.kernel.org Subject: [PATCH v9 54/61] fs: Convert buffer to XArray Date: Tue, 13 Mar 2018 06:26:32 -0700 Message-Id: <20180313132639.17387-55-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180313132639.17387-1-willy@infradead.org> References: <20180313132639.17387-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 Mostly comment fixes, but one use of __xa_set_tag. Signed-off-by: Matthew Wilcox --- fs/buffer.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index f3059f929dd6..5c798ecf7a39 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -585,7 +585,7 @@ void mark_buffer_dirty_inode(struct buffer_head *bh, struct inode *inode) EXPORT_SYMBOL(mark_buffer_dirty_inode); /* - * Mark the page dirty, and set it dirty in the radix tree, and mark the inode + * Mark the page dirty, and set it dirty in the page cache, and mark the inode * dirty. * * If warn is true, then emit a warning if the page is not uptodate and has @@ -602,8 +602,8 @@ void __set_page_dirty(struct page *page, struct address_space *mapping, if (page->mapping) { /* Race with truncate? */ WARN_ON_ONCE(warn && !PageUptodate(page)); account_page_dirtied(page, mapping); - radix_tree_tag_set(&mapping->i_pages, - page_index(page), PAGECACHE_TAG_DIRTY); + __xa_set_tag(&mapping->i_pages, page_index(page), + PAGECACHE_TAG_DIRTY); } xa_unlock_irqrestore(&mapping->i_pages, flags); } @@ -1066,7 +1066,7 @@ __getblk_slow(struct block_device *bdev, sector_t block, * The relationship between dirty buffers and dirty pages: * * Whenever a page has any dirty buffers, the page's dirty bit is set, and - * the page is tagged dirty in its radix tree. + * the page is tagged dirty in the page cache. * * At all times, the dirtiness of the buffers represents the dirtiness of * subsections of the page. If the page has buffers, the page dirty bit is @@ -1089,9 +1089,9 @@ __getblk_slow(struct block_device *bdev, sector_t block, * mark_buffer_dirty - mark a buffer_head as needing writeout * @bh: the buffer_head to mark dirty * - * mark_buffer_dirty() will set the dirty bit against the buffer, then set its - * backing page dirty, then tag the page as dirty in its address_space's radix - * tree and then attach the address_space's inode to its superblock's dirty + * mark_buffer_dirty() will set the dirty bit against the buffer, then set + * its backing page dirty, then tag the page as dirty in the page cache + * and then attach the address_space's inode to its superblock's dirty * inode list. * * mark_buffer_dirty() is atomic. It takes bh->b_page->mapping->private_lock, -- 2.16.1