Merge branch 'for-linus' into for-linus-3.12

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

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b0203b1322acc936e378f05cd26c17e0df864496..043b215769c2c68c538ea147d5cde0721221b833 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -3329,7 +3329,7 @@ int btrfs_resume_balance_async(struct btrfs_fs_info *fs_info)
        }
 
        tsk = kthread_run(balance_kthread, fs_info, "btrfs-balance");
-       return PTR_RET(tsk);
+       return PTR_ERR_OR_ZERO(tsk);
 }
 
 int btrfs_recover_balance(struct btrfs_fs_info *fs_info)