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

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/cmlb.c
          +++ new/usr/src/uts/common/io/cmlb.c
↓ open down ↓ 2700 lines elided ↑ open up ↑
2701 2701          return (rval);
2702 2702  
2703 2703  #else   /* #elif defined(_FIRMWARE_NEEDS_FDISK) */
2704 2704  #error "fdisk table presence undetermined for this platform."
2705 2705  #endif  /* #if defined(_NO_FDISK_PRESENT) */
2706 2706  }
2707 2707  
2708 2708  static void
2709 2709  cmlb_swap_efi_gpt(efi_gpt_t *e)
2710 2710  {
2711      -        _NOTE(ASSUMING_PROTECTED(*e))
2712 2711          e->efi_gpt_Signature = LE_64(e->efi_gpt_Signature);
2713 2712          e->efi_gpt_Revision = LE_32(e->efi_gpt_Revision);
2714 2713          e->efi_gpt_HeaderSize = LE_32(e->efi_gpt_HeaderSize);
2715 2714          e->efi_gpt_HeaderCRC32 = LE_32(e->efi_gpt_HeaderCRC32);
2716 2715          e->efi_gpt_MyLBA = LE_64(e->efi_gpt_MyLBA);
2717 2716          e->efi_gpt_AlternateLBA = LE_64(e->efi_gpt_AlternateLBA);
2718 2717          e->efi_gpt_FirstUsableLBA = LE_64(e->efi_gpt_FirstUsableLBA);
2719 2718          e->efi_gpt_LastUsableLBA = LE_64(e->efi_gpt_LastUsableLBA);
2720 2719          UUID_LE_CONVERT(e->efi_gpt_DiskGUID, e->efi_gpt_DiskGUID);
2721 2720          e->efi_gpt_PartitionEntryLBA = LE_64(e->efi_gpt_PartitionEntryLBA);
↓ open down ↓ 3 lines elided ↑ open up ↑
2725 2724              LE_32(e->efi_gpt_SizeOfPartitionEntry);
2726 2725          e->efi_gpt_PartitionEntryArrayCRC32 =
2727 2726              LE_32(e->efi_gpt_PartitionEntryArrayCRC32);
2728 2727  }
2729 2728  
2730 2729  static void
2731 2730  cmlb_swap_efi_gpe(int nparts, efi_gpe_t *p)
2732 2731  {
2733 2732          int i;
2734 2733  
2735      -        _NOTE(ASSUMING_PROTECTED(*p))
2736 2734          for (i = 0; i < nparts; i++) {
2737 2735                  UUID_LE_CONVERT(p[i].efi_gpe_PartitionTypeGUID,
2738 2736                      p[i].efi_gpe_PartitionTypeGUID);
2739 2737                  p[i].efi_gpe_StartingLBA = LE_64(p[i].efi_gpe_StartingLBA);
2740 2738                  p[i].efi_gpe_EndingLBA = LE_64(p[i].efi_gpe_EndingLBA);
2741 2739                  /* PartitionAttrs */
2742 2740          }
2743 2741  }
2744 2742  
2745 2743  static int
↓ open down ↓ 1103 lines elided ↑ open up ↑
3849 3847          int             i;
3850 3848  #if defined(_SUNOS_VTOC_16)
3851 3849          struct dkl_partition    *vp;
3852 3850  #endif
3853 3851  
3854 3852          /*
3855 3853           * Set the map for all logical partitions.  We lock
3856 3854           * the priority just to make sure an interrupt doesn't
3857 3855           * come in while the map is half updated.
3858 3856           */
3859      -        _NOTE(DATA_READABLE_WITHOUT_LOCK(cmlb_lun::cl_solaris_size))
3860 3857          mutex_enter(CMLB_MUTEX(cl));
3861 3858  
3862 3859          if (cl->cl_blockcount > CMLB_OLDVTOC_LIMIT) {
3863 3860                  mutex_exit(CMLB_MUTEX(cl));
3864 3861                  return (ENOTSUP);
3865 3862          }
3866 3863          mutex_exit(CMLB_MUTEX(cl));
3867 3864          if (cl->cl_solaris_size == 0) {
3868 3865                  return (EIO);
3869 3866          }
↓ open down ↓ 1300 lines elided ↑ open up ↑
5170 5167                   * mboot has been written successfully.
5171 5168                   * update the fdisk and vtoc tables in memory
5172 5169                   */
5173 5170                  rval = cmlb_update_fdisk_and_vtoc(cl, tg_cookie);
5174 5171                  if ((!cl->cl_f_geometry_is_valid) || (rval != 0)) {
5175 5172                          mutex_exit(CMLB_MUTEX(cl));
5176 5173                          kmem_free(mboot, cl->cl_sys_blocksize);
5177 5174                          return (rval);
5178 5175                  }
5179 5176          }
5180      -
5181      -#ifdef __lock_lint
5182      -        cmlb_setup_default_geometry(cl, tg_cookie);
5183      -#endif
5184      -
5185 5177  #else
5186 5178          if (rval == 0) {
5187 5179                  /*
5188 5180                   * mboot has been written successfully.
5189 5181                   * set up the default geometry and VTOC
5190 5182                   */
5191 5183                  if (cl->cl_blockcount <= CMLB_EXTVTOC_LIMIT)
5192 5184                          cmlb_setup_default_geometry(cl, tg_cookie);
5193 5185          }
5194 5186  #endif
↓ open down ↓ 634 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX