From patchwork Sun Jun 17 02:00:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468305 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 A8D96600CC for ; Sun, 17 Jun 2018 02:03:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9A2A628686 for ; Sun, 17 Jun 2018 02:03:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8EA8B288BF; Sun, 17 Jun 2018 02:03:47 +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 16D4E28696 for ; Sun, 17 Jun 2018 02:03:47 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A322A6B028E; Sat, 16 Jun 2018 22:01:31 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 96B506B028F; Sat, 16 Jun 2018 22:01:31 -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 7A0026B0290; Sat, 16 Jun 2018 22:01:31 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f71.google.com (mail-pl0-f71.google.com [209.85.160.71]) by kanga.kvack.org (Postfix) with ESMTP id 1CB026B028E for ; Sat, 16 Jun 2018 22:01:31 -0400 (EDT) Received: by mail-pl0-f71.google.com with SMTP id 89-v6so7733470plc.1 for ; Sat, 16 Jun 2018 19:01:31 -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=f7Iyf3ITTQ3FIk5xcaWpgNSsAQ83TFpCp98rUBknrdw=; b=V8FPe5nB3FTNP5loUzPwLqYIsNV1P1jy+FlGcwkXupMV2+yL1zruwf62ouAZE4DS8O XECXv3a77NySOw9i7IITXDdhsEC/hGjfSf3unGQy8oF8s3/hzh2sVtwmQuPiqLW6W4S3 awRvsm+uEHFvcOZfiNJrXVMfbJKV8OjduLMlSzdo4PxV8vEkDrkWF+tXCPSj4EwPM1aQ /gQeFMulzVqR6/yd8GtZjH78vb5Ylr5DIYfugSHRs+hvrcv8D0bGJStOSC34hcztywwf y6XSngbU7MN4zlA2VwTKazzTkC6UDc8zT9fgiCGWR7XxS6hQvNL7csp3hhMT0EOZYjKr m7qw== X-Gm-Message-State: APt69E1YdanxK25ZEAorwjuWgY8CQMGOE7kq//eMkbm9ap5odKOvY895 9Jr79JmyZ6t1BkVJP1j8IHzVvucm6/Q0922oE1KJmCmBWYxuGWLQ9+YfOx34i0ezS7zQpqcva3+ TeCnTxPXn/dF5/vDX2QKjWx0dK7pniwjZBCNh5XZsuvUkvxH3dKzMj3rgOAnyy9FV2A== X-Received: by 2002:a62:ed13:: with SMTP id u19-v6mr8057821pfh.125.1529200890804; Sat, 16 Jun 2018 19:01:30 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJHvFT4oLv0Xx7WYlbCMxaCFDYwNqYMiK2zO06Jn60f1ovaIKeHOE1YN1n2725IipG/NnwA X-Received: by 2002:a62:ed13:: with SMTP id u19-v6mr8057765pfh.125.1529200889809; Sat, 16 Jun 2018 19:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200889; cv=none; d=google.com; s=arc-20160816; b=eiUgdLH+a3U6J8Nrpv/oOeSunsKRxCgY4vkkg0nKZmo52ols/1AWJhLLFmuIWvVeGY ZJKmlsC1EUOd0VGStPNASNIAcRQ3G/CM+K+gs59Sgfvqe3QgM96nMNp63DSuggK45HHl LlY92XwgcBX5msyaZt77k/NPDWgSAPwF+vVGsIJBYaR4sXl02ZWp4XuaGvDLMTFXGLp4 52h7KfeLuwZsqD7+jcb2WJePey5Yb3xvieNjuFogblugGWki98JcN4hiG4QtukX8uUCL EQdRxmBnaGZqd9/gsSEZoj1D00GsrA2bKw/aaweG21Yoik+BK7u8TyE6bbRpzjVgTrH8 9aLw== 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=f7Iyf3ITTQ3FIk5xcaWpgNSsAQ83TFpCp98rUBknrdw=; b=mDsnls1n2+4SP9UtRqVhAEl6ACPx2y+rP9IsAcWAhV6uwawZrg88h7a3NB55Kj1UDh rncihOFWER7lTHNpxkhWaKg7yVac1umsybywttGAHfQlvaspWtL6QTSJo2zt1b1Tapts 87X35ffOHQ7NWRWqW0qisNmWhYZ3bZr7YJcHtpI/DhtyQFvSk1hxyPm+b3vaPAJyVxAZ +ecm2ontshfFbjeSsmx3LbwxVd0Q5ot0JK4pLGFTLHOhvtGCaQDH5tQ15vgbVZj1H4lZ NaTyXKneK6VNc4qhdiBujF8QdLgbaBCDClnC7o0FMxqzaBtbYUQVMBY5HfSzNqhDbtd5 WxPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=CdmkJCRs; 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 a10-v6si10743320pff.304.2018.06.16.19.01.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:29 -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=CdmkJCRs; 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=f7Iyf3ITTQ3FIk5xcaWpgNSsAQ83TFpCp98rUBknrdw=; b=CdmkJCRsi+wjbP40k5K1z3WBe KVkUK9wUX2QZkLV3tRZ2fNaw62SaxUrS7qTOqkKsS7RHbTqmsSbjVxb7Jd0Y5/JHTHIhCP65nxtz1 bquETwD1xu7Jk4Bi+pKELSAtdtdyRWeqSrAWvbNiU0d54lv6JzxcmRTorjBjLJ0EqG0H+ToD31xZg ZkdyaGjVdTG+tQTEQDVDCvt0O0sF1bPTK6FFmFs1SlwSrwbFUndVMtx0nCmIj3LB1obRbrw4uwcyW hklm4Ywthohwu0mDA0435lFvj1q/qJNC8Me2/SDJsK3f2XThaCLNBMzcDbSjDyvNvJhC+EpFMt69f mRku16C1Q==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUN0R-0001ag-PI; Sun, 17 Jun 2018 02:01:27 +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 61/74] f2fs: Convert to XArray Date: Sat, 16 Jun 2018 19:00:39 -0700 Message-Id: <20180617020052.4759-62-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 This is a straightforward conversion. Signed-off-by: Matthew Wilcox --- fs/f2fs/data.c | 4 ++-- fs/f2fs/dir.c | 2 +- fs/f2fs/f2fs.h | 2 +- fs/f2fs/inline.c | 2 +- fs/f2fs/node.c | 6 ++---- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index e5c0b1e74ce6..b274300995cd 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -2600,13 +2600,13 @@ const struct address_space_operations f2fs_dblock_aops = { #endif }; -void f2fs_clear_radix_tree_dirty_tag(struct page *page) +void f2fs_clear_page_cache_dirty_tag(struct page *page) { struct address_space *mapping = page_mapping(page); unsigned long flags; xa_lock_irqsave(&mapping->i_pages, flags); - radix_tree_tag_clear(&mapping->i_pages, page_index(page), + __xa_clear_tag(&mapping->i_pages, page_index(page), PAGECACHE_TAG_DIRTY); xa_unlock_irqrestore(&mapping->i_pages, flags); } diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 7f955c4e86a4..9c2a23242f64 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -730,7 +730,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page, if (bit_pos == NR_DENTRY_IN_BLOCK && !f2fs_truncate_hole(dir, page->index, page->index + 1)) { - f2fs_clear_radix_tree_dirty_tag(page); + f2fs_clear_page_cache_dirty_tag(page); clear_page_dirty_for_io(page); ClearPagePrivate(page); ClearPageUptodate(page); diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index 4d8b1de83143..1f71ab2ddad9 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -2973,7 +2973,7 @@ int f2fs_migrate_page(struct address_space *mapping, struct page *newpage, struct page *page, enum migrate_mode mode); #endif bool f2fs_overwrite_io(struct inode *inode, loff_t pos, size_t len); -void f2fs_clear_radix_tree_dirty_tag(struct page *page); +void f2fs_clear_page_cache_dirty_tag(struct page *page); /* * gc.c diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 043830be5662..48f40d344a2a 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -226,7 +226,7 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) kunmap_atomic(src_addr); set_page_dirty(dn.inode_page); - f2fs_clear_radix_tree_dirty_tag(page); + f2fs_clear_page_cache_dirty_tag(page); set_inode_flag(inode, FI_APPEND_WRITE); set_inode_flag(inode, FI_DATA_EXIST); diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index 10643b11bd59..9aa076be8a0e 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -103,7 +103,7 @@ bool f2fs_available_free_memory(struct f2fs_sb_info *sbi, int type) static void clear_node_page_dirty(struct page *page) { if (PageDirty(page)) { - f2fs_clear_radix_tree_dirty_tag(page); + f2fs_clear_page_cache_dirty_tag(page); clear_page_dirty_for_io(page); dec_page_count(F2FS_P_SB(page), F2FS_DIRTY_NODES); } @@ -1168,9 +1168,7 @@ void f2fs_ra_node_page(struct f2fs_sb_info *sbi, nid_t nid) if (f2fs_check_nid_range(sbi, nid)) return; - rcu_read_lock(); - apage = radix_tree_lookup(&NODE_MAPPING(sbi)->i_pages, nid); - rcu_read_unlock(); + apage = xa_load(&NODE_MAPPING(sbi)->i_pages, nid); if (apage) return;