Merge tag 'gfs2-v6.6-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 73ae5fc..b108c5d 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1125,8 +1125,7 @@ static int init_threads(struct gfs2_sbd *sdp)
        return 0;
 
 fail:
-       kthread_stop(sdp->sd_logd_process);
-       put_task_struct(sdp->sd_logd_process);
+       kthread_stop_put(sdp->sd_logd_process);
        sdp->sd_logd_process = NULL;
        return error;
 }
@@ -1134,13 +1133,11 @@ fail:
 void gfs2_destroy_threads(struct gfs2_sbd *sdp)
 {
        if (sdp->sd_logd_process) {
-               kthread_stop(sdp->sd_logd_process);
-               put_task_struct(sdp->sd_logd_process);
+               kthread_stop_put(sdp->sd_logd_process);
                sdp->sd_logd_process = NULL;
        }
        if (sdp->sd_quotad_process) {
-               kthread_stop(sdp->sd_quotad_process);
-               put_task_struct(sdp->sd_quotad_process);
+               kthread_stop_put(sdp->sd_quotad_process);
                sdp->sd_quotad_process = NULL;
        }
 }