Received: by 10.223.185.116 with SMTP id b49csp4138845wrg; Mon, 19 Feb 2018 11:52:35 -0800 (PST) X-Google-Smtp-Source: AH8x225MiRq64aqin1v56V4l2/UOncVo6zbDu2loObm8PYknggXqGUgBFEfKvSUBJ1dGI0hJP86U X-Received: by 10.98.248.4 with SMTP id d4mr15681790pfh.78.1519069954917; Mon, 19 Feb 2018 11:52:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519069954; cv=none; d=google.com; s=arc-20160816; b=sPfR+j3rftiBqk8bRuE6jXwLzWGF3QEJvmT+QT9J9qGZMsr4vbGYUnBmsTgWFVdIWI 1M5ILPvLQ9+j9xn7VN0QVeten418fKgQGZ6cDTqBv4j4JuFtYp6GvRaaNDX439ggD5+9 0ltbRAQvzMd4VQ3Jy/lFWX0NXPOwC2dlx6DOmrDqhpteSEU0NjAZsPLpezteg7ohQ4Z4 CEQ04xsiV+2N6Z2npV+6wUGG9wc98wlUQed2wxqT3oxxh2YlaC7TC426cdDN3L9q1zQ+ Z0zkvBpdEy9tAJ9VU6JkKl3qZF5Toq1z/7VRDOCJOfolhto55JOMOwt7uenQuSe7z+Sa myaw== 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=uDsaWi+YNpB2GQWhuqX8XiLqZqd0b0j2aVQjpTDd6oI=; b=SFBKLHOl2A/G82S/cmdgZVPuJ79if3MCCH5OlmezowOSO0zl4QF9ojuXVZr5GPTLCW s6TRniceTPYrwnZRp6wiENksNmRV509DUBPBN4DSmfd7Wv/O6wnl56B4vYcrR9szd1iU Ld/T31sXWdxqmqeXDyUSDWOGOXGMqD7GAnGw2Z0rtAtFzQ8gXUhYK1J4nPuIskEHOrJ3 2x46aPuBYbn+Rt180z0DKjx/dUJbfzMnlrVSbI7Puth1M7Ys4U+O7MGVHhKnu9iHkwUA o41pVDE7pvcHGLHpN1eSG4bjc56gTGPNdNpKHnxk2PUhrY28bSMxthXTfPjQQLv+AFnF pEnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=LRtCIuuw; 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 p68si7315332pfp.226.2018.02.19.11.52.20; Mon, 19 Feb 2018 11:52:34 -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=LRtCIuuw; 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 S1753965AbeBSTti (ORCPT + 99 others); Mon, 19 Feb 2018 14:49:38 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:45054 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753647AbeBSTqa (ORCPT ); Mon, 19 Feb 2018 14:46:30 -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=uDsaWi+YNpB2GQWhuqX8XiLqZqd0b0j2aVQjpTDd6oI=; b=LRtCIuuwdzTwUtGho3ZM/eeKZ Pez5eMCYJQV8LZ4YZKAzKINVpq7+EImPqjOz3zp1hVRfOIXHMlyspsBJc693OegOda8TVS4QKhCHL DfQRHtkEY9QmQ3UeknY/yhom4dj+ja7W1ccVVIvsA48zo1XdkmdZAspU6I4u+ALpNeCHFUcCNUu8h 078ILvPApQD0355AmRvyaIDfKwwzwos9Aukv8NYk6oAGDwIen1xAqbQyPxmsby/q2HnlU9NIp2Qxc i1+Yi/EVzr0rJCwBlUtITTtGSkru3PNOa1EnvBphH4Mb0wCON/J5Nn+CMob62k/96L9dpTwCVOXvZ GKkMQqN3Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.89 #1 (Red Hat Linux)) id 1enrOP-0001wt-GZ; Mon, 19 Feb 2018 19:46:29 +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 55/61] fs: Convert buffer to XArray Date: Mon, 19 Feb 2018 11:45:50 -0800 Message-Id: <20180219194556.6575-56-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 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 692ee249fb6a..e69c9d39e5d4 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->pages, - page_index(page), PAGECACHE_TAG_DIRTY); + __xa_set_tag(&mapping->pages, page_index(page), + PAGECACHE_TAG_DIRTY); } xa_unlock_irqrestore(&mapping->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