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

@@ -1050,29 +1050,10 @@
         0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 static caddr_t pid = "SESS01          ";
 
-#if     !defined(lint)
-
-_NOTE(MUTEX_PROTECTS_DATA(fcp_global_mutex,
-    fcp_port::fcp_next fcp_watchdog_id))
-
-_NOTE(DATA_READABLE_WITHOUT_LOCK(fcp_watchdog_time))
-
-_NOTE(SCHEME_PROTECTS_DATA("Unshared",
-    fcp_insert_eid
-    fcp_remove_eid
-    fcp_watchdog_time))
-
-_NOTE(SCHEME_PROTECTS_DATA("Unshared",
-    fcp_cb_ops
-    fcp_ops
-    callb_cpr))
-
-#endif /* lint */
-
 /*
  * This table is used to determine whether or not it's safe to copy in
  * the target node name for a lun.  Since all luns behind the same target
  * have the same wwnn, only tagets that do not support multiple luns are
  * eligible to be enumerated under mpxio if they aren't page83 compliant.

@@ -9826,26 +9807,21 @@
                             ddi_driver_name(pptr->port_dip));
                         fcp_enable_auto_configuration = 0;
                         kmem_free(pathname, MAXPATHLEN);
                 }
         }
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(pptr->port_link_cnt));
         pptr->port_link_cnt = 1;
-        _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(pptr->port_link_cnt));
         pptr->port_id = s_id;
         pptr->port_instance = instance;
-        _NOTE(NOW_INVISIBLE_TO_OTHER_THREADS(pptr->port_state));
         pptr->port_state = FCP_STATE_INIT;
         if (pinfo->port_acc_attr == NULL) {
                 /*
                  * The corresponding FCA doesn't support DMA at all
                  */
                 pptr->port_state |= FCP_STATE_FCA_IS_NODMA;
         }
 
-        _NOTE(NOW_VISIBLE_TO_OTHER_THREADS(pptr->port_state));
-
         if (!(pptr->port_state & FCP_STATE_FCA_IS_NODMA)) {
                 /*
                  * If FCA supports DMA in SCSI data phase, we need preallocate
                  * dma cookie, so stash the cookie size
                  */

@@ -14234,13 +14210,11 @@
         fpkt->pkt_cmd_fhdr.s_id = pptr->port_id;
 
         /*
          * Save a few kernel cycles here
          */
-#ifndef __lock_lint
         fpkt->pkt_fca_device = ptgt->tgt_fca_dev;
-#endif /* __lock_lint */
 }
 
 static void
 fcp_post_callback(struct fcp_pkt *cmd)
 {