From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthew Wilcox Subject: [PATCH v6 52/99] fs: Convert buffer to XArray Date: Wed, 17 Jan 2018 12:21:16 -0800 Message-ID: <20180117202203.19756-53-willy@infradead.org> References: <20180117202203.19756-1-willy@infradead.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; 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=Pu5JcXjlly25xQrgLzXZh25F7ow6+azETppMFJy1RFw=; b=b0730aj4QYh6PH2MlYD+8Ymnci aQOZPIgLcWZmQcHutT0iC3Ob0z0yivKNRB7VbKRb5yb8JlA+08Fxx8Bb1o43tEk+W1dB9Vz6tkn23 DZtLoFDkQX/UL9dcAKLX6qYyTh8J8eg9lN3EoLPSG2ExeyqI3T4wGt7uiRZgVph3zXNY=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; 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=Pu5JcXjlly25xQrgLzXZh25F7ow6+azETppMFJy1RFw=; b=RmhpHXKamApNXZWe297YZS1OH4 EkukjhLCBAAzJPBNkfim1m7GDtZOhqJHBRbZ8M1lFS1BgpcuYYyyc1HXBM6xBXfUkPa28ZmF/zj7B nixMTCHSLR3DuR4G0FukPXHFmxrkjVptqWDs+fd+Xt+XAi8t3fDNtevfljq5n9Ko3Ogg=; 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=Pu5JcXjlly25xQrgLzXZh25F7ow6+azETppMFJy1RFw=; b=SpzqII4UFRB4WCyAl5+wd3wK0 ifFMlWM/OI93r+LigCPj6dFgClqSogc/RX/RQB/kQFOSz4lEG4gpDN/3A3vRxS/0aKGNhhCnLLzeq pkK/cRudQOiu+RZXRzw7Gj4C/yHTyC/FQNQZcMyaDKCnyzrySu1JE6QlYW41M4lOQZDM1zaiGByt8 QO7PPr9gj24PjIpfJnhPddXYz0Kzo4/q7YIVVdgJBUvO7L+SmmEZ+ITI7r665IcEPIJzbMOCjHxZA NFUWQZKA47rS1PClamXT5R0cPua0y8SVqUapBZBre7SHPAuS1yv8Inl7hrxeFdCskYYCndqwJyZ6K vet6w53yA==; In-Reply-To: <20180117202203.19756-1-willy@infradead.org> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net To: linux-kernel@vger.kernel.org Cc: linux-s390@vger.kernel.org, David Howells , linux-nilfs@vger.kernel.org, Matthew Wilcox , linux-sh@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-usb@vger.kernel.org, linux-remoteproc@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-xfs@vger.kernel.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org, Stefano Stabellini , linux-fsdevel@vger.kernel.org, cgroups@vger.kernel.org, Bjorn Andersson , linux-btrfs@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 1a6ae530156b..e1d18307d5c8 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -592,7 +592,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 @@ -609,8 +609,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); } @@ -1072,7 +1072,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 @@ -1095,9 +1095,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.15.1 ------------------------------------------------------------------------------ Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot