| Message ID | 1386581671-4639-1-git-send-email-bo.li.liu@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Quoting Liu Bo (2013-12-09 04:34:31) > 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. Thanks Liu. Have you tested this with orphan replay? I'd like to make sure the new ordering of starting caching isn't causing problems with finding and processing the orphan items. -chris -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 9c9667d..93b4473 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1525,14 +1525,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,
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 <bo.li.liu@oracle.com> --- fs/btrfs/disk-io.c | 9 +++++---- fs/btrfs/inode-map.c | 2 ++ 2 files changed, 7 insertions(+), 4 deletions(-)