Merge tag 'stable/for-linus-3.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / fs / btrfs / delayed-inode.c

diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
index 451b00c86f6c0a038ed532f29855009abaa1d8a3..33e561a84013f19bb327939e7860753bd5eaa0bf 100644 (file)
--- a/fs/btrfs/delayed-inode.c
+++ b/fs/btrfs/delayed-inode.c
@@ -1392,11 +1392,11 @@ static int btrfs_wq_run_delayed_node(struct btrfs_delayed_root *delayed_root,
                return -ENOMEM;
 
        async_work->delayed_root = delayed_root;
-       async_work->work.func = btrfs_async_run_delayed_root;
-       async_work->work.flags = 0;
+       btrfs_init_work(&async_work->work, btrfs_async_run_delayed_root,
+                       NULL, NULL);
        async_work->nr = nr;
 
-       btrfs_queue_worker(&root->fs_info->delayed_workers, &async_work->work);
+       btrfs_queue_work(root->fs_info->delayed_workers, &async_work->work);
        return 0;
 }