Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[cascardo/linux.git] / fs / btrfs / inode-map.c

diff --git a/fs/btrfs/inode-map.c b/fs/btrfs/inode-map.c
index 83d646b..74faea3 100644 (file)
--- a/fs/btrfs/inode-map.c
+++ b/fs/btrfs/inode-map.c
@@ -178,7 +178,7 @@ static void start_caching(struct btrfs_root *root)
                          root->root_key.objectid);
        if (IS_ERR(tsk)) {
                btrfs_warn(root->fs_info, "failed to start inode caching task");
-               btrfs_clear_and_info(root, CHANGE_INODE_CACHE,
+               btrfs_clear_pending_and_info(root->fs_info, INODE_MAP_CACHE,
                                "disabling inode map caching");
        }
 }
@@ -364,6 +364,8 @@ void btrfs_init_free_ino_ctl(struct btrfs_root *root)
        ctl->start = 0;
        ctl->private = NULL;
        ctl->op = &free_ino_op;
+       INIT_LIST_HEAD(&ctl->trimming_ranges);
+       mutex_init(&ctl->cache_writeout_mutex);
 
        /*
         * Initially we allow to use 16K of ram to cache chunks of