From patchwork Fri Dec 13 09:16:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Bo X-Patchwork-Id: 3339221 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B1F67C0D4A for ; Fri, 13 Dec 2013 09:16:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 22E0C20800 for ; Fri, 13 Dec 2013 09:16:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2025220609 for ; Fri, 13 Dec 2013 09:16:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752214Ab3LMJQl (ORCPT ); Fri, 13 Dec 2013 04:16:41 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:42965 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751762Ab3LMJQj (ORCPT ); Fri, 13 Dec 2013 04:16:39 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id rBD9GcRx026177 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 13 Dec 2013 09:16:39 GMT Received: from aserz7021.oracle.com (aserz7021.oracle.com [141.146.126.230]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id rBD9GbLf027084 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 13 Dec 2013 09:16:38 GMT Received: from abhmp0006.oracle.com (abhmp0006.oracle.com [141.146.116.12]) by aserz7021.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id rBD9Gbmb016818 for ; Fri, 13 Dec 2013 09:16:37 GMT Received: from localhost.jp.oracle.com (/10.191.13.82) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 13 Dec 2013 01:16:37 -0800 From: Liu Bo To: linux-btrfs@vger.kernel.org Subject: [PATCH 1/3] Btrfs: avoid building inode cache repeatly Date: Fri, 13 Dec 2013 17:16:21 +0800 Message-Id: <1386926183-18325-2-git-send-email-bo.li.liu@oracle.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1386926183-18325-1-git-send-email-bo.li.liu@oracle.com> References: <1386926183-18325-1-git-send-email-bo.li.liu@oracle.com> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Inode cache is similar to free space cache and in fact shares the same code, however, we don't load inode cache unless we're about to allocate inode id, then there is a case where we only commit the transaction during other operations, such as snapshot creation, we now update fs roots' generation to the new transaction id, after that when we want to load the inode cache, we'll find that it's not valid thanks to the mismatch of generation, and we have to push btrfs-ino-cache thread to build inode cache from disk, and this operation is sometimes time-costing. So to fix the above, we load inode cache into memory during reading fs root. Signed-off-by: Liu Bo --- fs/btrfs/disk-io.c | 9 +++++---- fs/btrfs/inode-map.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 8072cfa..cb0b12b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1524,14 +1524,15 @@ int btrfs_init_fs_root(struct btrfs_root *root) goto fail; } - btrfs_init_free_ino_ctl(root); + ret = get_anon_bdev(&root->anon_dev); + if (ret) + goto fail; + mutex_init(&root->fs_commit_mutex); spin_lock_init(&root->cache_lock); init_waitqueue_head(&root->cache_wait); + btrfs_init_free_ino_ctl(root); - ret = get_anon_bdev(&root->anon_dev); - if (ret) - goto fail; return 0; fail: kfree(root->free_ino_ctl); diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c index ab485e5..6c8d7bb 100644 --- a/fs/btrfs/inode-map.c +++ b/fs/btrfs/inode-map.c @@ -388,6 +388,8 @@ void btrfs_init_free_ino_ctl(struct btrfs_root *root) pinned->private = NULL; pinned->extents_thresh = 0; pinned->op = &pinned_free_ino_op; + + start_caching(root); } int btrfs_save_ino_cache(struct btrfs_root *root,