Print this page
8368 remove warlock leftovers from usr/src/uts

@@ -2624,14 +2624,12 @@
 fcsm_job_thread(fcsm_t *fcsm)
 {
         fcsm_job_t      *job;
 
         ASSERT(fcsm != NULL);
-#ifndef __lock_lint
         CALLB_CPR_INIT(&fcsm->sm_cpr_info, &fcsm->sm_mutex,
             callb_generic_cpr, "fcsm_job_thread");
-#endif /* __lock_lint */
 
         for (;;) {
                 mutex_enter(&fcsm->sm_mutex);
 
                 while (fcsm->sm_job_head == NULL ||

@@ -2679,13 +2677,11 @@
                         ASSERT(fcsm->sm_job_head == NULL);
                         ASSERT(fcsm->sm_job_tail == NULL);
                         ASSERT(fcsm->sm_retry_head == NULL);
                         ASSERT(fcsm->sm_retry_tail == NULL);
                         job->job_result = FC_SUCCESS;
-#ifndef __lock_lint
                         CALLB_CPR_EXIT(&fcsm->sm_cpr_info);
-#endif
                         /* CPR_EXIT has also dropped the fcsm->sm_mutex */
 
                         fcsm_jobdone(job);
                         thread_exit();
                         /* NOTREACHED */