Print this page
patch lower-case-segops

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/fs/proc/prvnops.c
          +++ new/usr/src/uts/common/fs/proc/prvnops.c
↓ open down ↓ 3700 lines elided ↑ open up ↑
3701 3701          if (strcmp(comp, "a.out") == 0) {
3702 3702                  vp = p->p_exec;
3703 3703                  goto out;
3704 3704          }
3705 3705          do {
3706 3706                  /*
3707 3707                   * Manufacture a filename for the "object" directory.
3708 3708                   */
3709 3709                  vattr.va_mask = AT_FSID|AT_NODEID;
3710 3710                  if (seg->s_ops == &segvn_ops &&
3711      -                    SEGOP_GETVP(seg, seg->s_base, &vp) == 0 &&
     3711 +                    segop_getvp(seg, seg->s_base, &vp) == 0 &&
3712 3712                      vp != NULL && vp->v_type == VREG &&
3713 3713                      VOP_GETATTR(vp, &vattr, 0, CRED(), NULL) == 0) {
3714 3714                          char name[64];
3715 3715  
3716 3716                          if (vp == p->p_exec)    /* "a.out" */
3717 3717                                  continue;
3718 3718                          pr_object_name(name, vp, &vattr);
3719 3719                          if (strcmp(name, comp) == 0)
3720 3720                                  goto out;
3721 3721                  }
↓ open down ↓ 430 lines elided ↑ open up ↑
4152 4152                  } else {
4153 4153                          AS_LOCK_ENTER(as, &as->a_lock, RW_READER);
4154 4154                          if ((seg = AS_SEGFIRST(as)) != NULL) {
4155 4155                                  do {
4156 4156                                          /*
4157 4157                                           * Manufacture a filename for the
4158 4158                                           * "object" directory.
4159 4159                                           */
4160 4160                                          vattr.va_mask = AT_FSID|AT_NODEID;
4161 4161                                          if (seg->s_ops == &segvn_ops &&
4162      -                                            SEGOP_GETVP(seg, seg->s_base, &vp)
     4162 +                                            segop_getvp(seg, seg->s_base, &vp)
4163 4163                                              == 0 &&
4164 4164                                              vp != NULL && vp->v_type == VREG &&
4165 4165                                              VOP_GETATTR(vp, &vattr, 0, CRED(),
4166 4166                                              NULL) == 0) {
4167 4167                                                  char name[64];
4168 4168  
4169 4169                                                  if (vp == p->p_exec)
4170 4170                                                          continue;
4171 4171                                                  idx++;
4172 4172                                                  pr_object_name(name, vp,
↓ open down ↓ 680 lines elided ↑ open up ↑
4853 4853           * (This is usually about two times too many entries.)
4854 4854           */
4855 4855          nalloc = (nalloc + 0xf) & ~0xf;         /* multiple of 16 */
4856 4856          dir = kmem_zalloc(nalloc * sizeof (vnode_t *), KM_SLEEP);
4857 4857  
4858 4858          /* fill in the new directory with desired entries */
4859 4859          nentries = 0;
4860 4860          do {
4861 4861                  vattr.va_mask = AT_FSID|AT_NODEID;
4862 4862                  if (seg->s_ops == &segvn_ops &&
4863      -                    SEGOP_GETVP(seg, seg->s_base, &vp) == 0 &&
     4863 +                    segop_getvp(seg, seg->s_base, &vp) == 0 &&
4864 4864                      vp != NULL && vp->v_type == VREG &&
4865 4865                      VOP_GETATTR(vp, &vattr, 0, CRED(), NULL) == 0) {
4866 4866                          for (i = 0; i < nentries; i++)
4867 4867                                  if (vp == dir[i])
4868 4868                                          break;
4869 4869                          if (i == nentries) {
4870 4870                                  ASSERT(nentries < nalloc);
4871 4871                                  dir[nentries++] = vp;
4872 4872                          }
4873 4873                  }
↓ open down ↓ 1186 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX