From patchwork Sun Jun 17 02:00:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468297 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 F1159600CC for ; Sun, 17 Jun 2018 02:03:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E1ED1283C8 for ; Sun, 17 Jun 2018 02:03:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6C03284DA; Sun, 17 Jun 2018 02:03:35 +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=ham 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 6CF6828426 for ; Sun, 17 Jun 2018 02:03:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id CA0CF6B028B; Sat, 16 Jun 2018 22:01:25 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C55B16B028C; Sat, 16 Jun 2018 22:01:25 -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 A830E6B028D; Sat, 16 Jun 2018 22:01:25 -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 5381A6B028B for ; Sat, 16 Jun 2018 22:01:25 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id x32-v6so7696326pld.16 for ; Sat, 16 Jun 2018 19:01:25 -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=OqzVPn6mYy8g9+6jefdMDT4tdMX8rFTuXWopfcwuKSE=; b=i2wqIdM87RXjDhmijB4pmt3ZmY/2JU0BngtgR3kQGg45PkjM5tnuxlmx2gnIlPcia0 dR/fJ5YiZbTW3KcMaXRRp38xhq8l/UlM5//Em8VT4uh4f0cRbNlE9wfkVZXoqq6f5/UG +/pf2N0C91u9C/SciQInYhLBMvtwzy++Rq8oyBSCO0Zz8da5aa/ipsSHl0gSsWJ3q36s FR+cdulAaiZf9D0LJsAQEPFWy8/WRgdNJaB/9jXeWMKhsozRLcFw29CCh0K7+BXp5kXL p5JyfIKuhme0fnhJnJCdYsJ8QTG4gnOQfEr8RHigJda5z6p6KGE4jIConIjd6Y8ylPiS v27g== X-Gm-Message-State: APt69E12NzT4+Zmka+VozrFWo9H7QjjhyfsC2JUJi+LQT7k5qJ3602Cn LN7ec+h+wfj5PuSEIaFRYNtPJ9c0jEyMdBRJ6jua/0Chj9B4V8lcW3MEE5pcB4CHxUaeeBX9F9Q HiEMaJSdUKfXAMB1kHGn7sKczqRUjqVbbjaKuWklSEwYXFPbleQQ2Z3ff+ZLaBLLfIQ== X-Received: by 2002:a62:c6d8:: with SMTP id x85-v6mr7847743pfk.249.1529200885017; Sat, 16 Jun 2018 19:01:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKnqP7XXzhhR283czD9gy36MY4Jy2IFrkIybQMNpc6lIXZun+ACjSYVbL/IzY2pqrGPaSp6 X-Received: by 2002:a62:c6d8:: with SMTP id x85-v6mr7847686pfk.249.1529200883832; Sat, 16 Jun 2018 19:01:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200883; cv=none; d=google.com; s=arc-20160816; b=f0WLjGDxveVyRusEpZM3fAZXHu2PLwtVJGgky13FY+sHN3g4sD8fTJINhgalJy5ysV +SgjFzihhvsxK6aThdvPtiVWAg4OPUwdnAa45XOyMfRn/M2PzGJfs+dqiluOVswjgzST VGS0NQdyHDAuFKOJVmitSediBsrizHuZT9ykfElR4wTF5oVWtjpC6weB9o65X2DR7RK3 3IHeoofbCn0cx7xgz7M8kIqNAoJb/Dv5RpJm5YK2qstT8R+utKPpTyRmXJyAxgQQq1KE qHtHA2U+wd2bQf4OksNHriwt69nQ9mgRx3jK5U6FVDQRexvuFbPmXTGtAUc9J/btwhjt ok+Q== 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=OqzVPn6mYy8g9+6jefdMDT4tdMX8rFTuXWopfcwuKSE=; b=fVPzzGU8pQD1XcxHCcr+aJBrMrjXY1qEh3fs7uVwZXNRnfgHkKB1lA36KVAgCkqQdX KVa0FqQsgiicKzjvzzefFBV06+RxvREDnOMjJKrywjkxIOVZ7FdOmLUIKBc/ugiEMebj CAcOUeUb7Mxwu/idHi2cUT+cN48hoaEcSgNacU28/kv4fd/eZWBxQjcRQ4O2sjW56uKo iE4jpacmQRXUYaJj86tYdQ/+tTvrrwQHUuLHIZCh4k7YHCkXFehbqQRH+Int2Xi0yzi2 07YlZbRGIwiProrj3UQ0QV6lnXmivxHDZrQVYY8uwCu8CW1Q2VbH5OjjDaSKZL85P3PB ESJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=LK7hNKas; 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 38-v6si11701470plc.446.2018.06.16.19.01.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:23 -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=LK7hNKas; 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=OqzVPn6mYy8g9+6jefdMDT4tdMX8rFTuXWopfcwuKSE=; b=LK7hNKasD9BmKXG6K9Zi2ZUEX jHFr90oJfeGjubgg7qdO2H9lTdDUz1bfQA9nPwPKlntkxwq12gJU+FSAjAEePTM6bU7jQkDnOc4Z5 DA7BPrpRcomFDHcBzjU5mJuSS3dIZ/N4WyGYe1SExRYHhLqwYGqFd3zV9yMinkZ2Wfuy+gR7Wu+kp LpS3ZLK2Mha+XwFHruQ8+SmiXPtY4GuwqixsEDcCNUoEBoCqzWXGklJ296v20Ci2zgodD4th+Sa1n 8ieGJxc3yzbOyYdvP/F1Fo2YYKljSQd82P536AAlec2GBV0FgR4Ac4X4Tqh/yLhF8z5tNRCdUnKRb riAmsv8DQ==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN0K-0001VK-GN; Sun, 17 Jun 2018 02:01:20 +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 v14 58/74] fs: Convert buffer to XArray Date: Sat, 16 Jun 2018 19:00:36 -0700 Message-Id: <20180617020052.4759-59-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-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 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,