Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp4235521imm; Mon, 11 Jun 2018 09:02:52 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLOXCfcgl5v0FUglyJvMHvv9YaZ7WmRCX6LbU0oGxzjyh9YpVoQ34/kM/CjpTK/EO/lpLKz X-Received: by 2002:a63:a119:: with SMTP id b25-v6mr15040436pgf.279.1528732971904; Mon, 11 Jun 2018 09:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528732971; cv=none; d=google.com; s=arc-20160816; b=PsrNJmrT0rEjBLgTSkjASbgQMxfSlUuunbw2pJKCoiIcngEaiIZ/YqeM90vr+QKcOC 7D79drWfrl4eTcNTWow62ITJVFJ3E+1xmvQ/rdoWwqdAggdcUjHQM859WAmAOPgrliME 3TiBI4/Hy8nB++WSJbHuMM60Ul8BtupFxcmE4Zt/iME9PIrQEH2syfPqVdG3juJhAYxq X4XLnY1WKUFsxSa3hMKQhY6WTQk+VW/+cClk2aa5RjXkiGETeDyI+QbkpQ24ti3+KXeo QUxJnlbmSe//7Z5+Bvxa44weo6BguqNLPBIavQoVfEOpcT9ICfcViMsrJmFz8GUBIY4D SI3A== 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=l7vqrsvTDgMQ5pcpSIqMCIBtnn2ngsgjRhaUjxPid4k=; b=YIO/RRSwvlMfOeSYUcmOa4dUxsvxjqErMpR5rEUwkwofflv9mQcvbgGaCQ1QzcnLUP 34+/6QE+xE/l2opckXmj63rlB8rpZnajKTois1tgFgryZObYwa8gpcXELD7+3mAzw9AA Ns6ejPO8GRmlM21FZxu657jX1zievrowg3p6DzjVCiX31VDUiycHmt0ziftZBY0gtPZ5 TEbmiREkA0/YkpOWuTHksyHvf1MVQLwxjjxp+A1605Dm11YBHQJylm61Gul6QTUJvwR5 PwYQH3LSl/9fWH6dJQfuFk/WYufV61wg4ALEA1jfyXe8C6w2UUijGItqBiMVWV2zZftw 6O7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=aPJhJ6xq; 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 v1-v6si11545385ply.458.2018.06.11.09.02.37; Mon, 11 Jun 2018 09:02:51 -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=aPJhJ6xq; 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 S933756AbeFKOH1 (ORCPT + 99 others); Mon, 11 Jun 2018 10:07:27 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:46406 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933620AbeFKOHI (ORCPT ); Mon, 11 Jun 2018 10:07:08 -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=l7vqrsvTDgMQ5pcpSIqMCIBtnn2ngsgjRhaUjxPid4k=; b=aPJhJ6xqOtMIh27P/19+yTKdJ hGTBCHyVnv8zdk4wqDHZEf+JBnnt9ZxU2hx/f5Zcc4XFGvmYgCkUGQudofIt+LyYFt6IXfT7IMXy4 sbdWtI4A8TMisIr3CC8z7NkNhaCDXIi4LyFszSz8H3Mv1X1nU45bNbX0mhMCCHe+nRQQqdAXfHgdS F/Qs7u/O4EC5wzYeLEbxo4/KRQ8JBYYXSRfqZPvNqiIw3JUCIJWbGznRT57pKT7ZlcV2WKBaSHf8Q pmmbPz6UNaqt9c+xfvz9G0WhSgJpSqlq12sBUUz5j2JK19+JqjbwTT5vDumr89J8d1R1Md2J4nAjF rRhACmRPw==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSNTP-0004wy-OM; Mon, 11 Jun 2018 14:07:07 +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 57/72] fs: Convert buffer to XArray Date: Mon, 11 Jun 2018 07:06:24 -0700 Message-Id: <20180611140639.17215-58-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> 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 8194e3049fc5..deae44fd64e9 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -562,7 +562,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 @@ -579,8 +579,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); } @@ -1043,7 +1043,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 @@ -1066,9 +1066,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.17.1