Print this page
6147 segop_getpolicy already checks for a NULL op
Reviewed by: Garrett D'Amore <garrett@damore.org>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/os/lgrp.c
          +++ new/usr/src/uts/common/os/lgrp.c
↓ open down ↓ 3493 lines elided ↑ open up ↑
3494 3494  
3495 3495          return (policy);
3496 3496  }
3497 3497  
3498 3498  /*
3499 3499   * Get memory allocation policy for this segment
3500 3500   */
3501 3501  lgrp_mem_policy_info_t *
3502 3502  lgrp_mem_policy_get(struct seg *seg, caddr_t vaddr)
3503 3503  {
3504      -        lgrp_mem_policy_info_t  *policy_info;
3505 3504          extern struct seg_ops   segspt_ops;
3506 3505          extern struct seg_ops   segspt_shmops;
3507 3506  
3508 3507          /*
3509 3508           * This is for binary compatibility to protect against third party
3510 3509           * segment drivers which haven't recompiled to allow for
3511 3510           * segop_getpolicy()
3512 3511           */
3513 3512          if (seg->s_ops != &segvn_ops && seg->s_ops != &segspt_ops &&
3514 3513              seg->s_ops != &segspt_shmops)
3515 3514                  return (NULL);
3516 3515  
3517      -        policy_info = NULL;
3518      -        if (seg->s_ops->getpolicy != NULL)
3519      -                policy_info = segop_getpolicy(seg, vaddr);
3520      -
3521      -        return (policy_info);
     3516 +        return (segop_getpolicy(seg, vaddr));
3522 3517  }
3523 3518  
3524 3519  /*
3525 3520   * Set policy for allocating private memory given desired policy, policy info,
3526 3521   * size in bytes of memory that policy is being applied.
3527 3522   * Return 0 if policy wasn't set already and 1 if policy was set already
3528 3523   */
3529 3524  int
3530 3525  lgrp_privm_policy_set(lgrp_mem_policy_t policy,
3531 3526      lgrp_mem_policy_info_t *policy_info, size_t size)
↓ open down ↓ 910 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX