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

[karo-tx-linux.git] / fs / btrfs / dev-replace.c

diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c
index af800ef677a0d334b0ec84fbae4e0c669e91780d..a64435359385e86a483f30696c932da2c8d5bdb0 100644 (file)
--- a/fs/btrfs/dev-replace.c
+++ b/fs/btrfs/dev-replace.c
@@ -747,7 +747,7 @@ int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info)
        WARN_ON(atomic_xchg(
                &fs_info->mutually_exclusive_operation_running, 1));
        task = kthread_run(btrfs_dev_replace_kthread, fs_info, "btrfs-devrepl");
-       return PTR_RET(task);
+       return PTR_ERR_OR_ZERO(task);
 }
 
 static int btrfs_dev_replace_kthread(void *data)