Quick Search:

Context

Displaying 3 lines either side each change. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace: Expand:

Diff

1.97.8.3
  
1.97.8.3.4.1
  
Orange-Migrate-Tools:wligon:20100730175907
  
get-attr.sm
_>330330             PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "type: metafile\n");
 331331             gossip_debug(GOSSIP_GETATTR_DEBUG,
 332332                          "  Req handle %llu refers to a metafile\n",
<>333 -                         llu(s_op->u.getattr.handle));
  333+                         llu(s_op->req->u.getattr.handle));
334334 
<>335 -            if (s_op->u.getattr.attrmask & PVFS_ATTR_META_DFILES)
  335+            if (s_op->req->u.getattr.attrmask & PVFS_ATTR_META_DFILES)
336336             {
 337337                 gossip_debug(GOSSIP_GETATTR_DEBUG,
 338338                              " dspace has dfile_count of %d\n",
      
 !
 
…
346346                 resp_attr->mask &= ~PVFS_ATTR_META_DFILES;
 347347             }
 348348 
<>349 -            if (s_op->u.getattr.attrmask & PVFS_ATTR_META_DIST)
  349+            if (s_op->req->u.getattr.attrmask & PVFS_ATTR_META_DIST)
350350             {
 351351                 gossip_debug(GOSSIP_GETATTR_DEBUG,
 352352                              " dspace has dist size of %d\n",
      
 !
 
…
362362                 resp_attr->mask &= ~PVFS_ATTR_META_DIST;
 363363             }
 364364 
<>365 -            if (s_op->u.getattr.attrmask & PVFS_ATTR_META_MIRROR_DFILES)
  365+            if (s_op->req->u.getattr.attrmask & PVFS_ATTR_META_MIRROR_DFILES)
366366             {
 367367                gossip_debug(GOSSIP_GETATTR_DEBUG,"client wants mirrored "
 368368                                                  "handles.\n");
      
 !
 
…
392392 
 393393             gossip_debug(GOSSIP_GETATTR_DEBUG, "  handle %llu refers to "
 394394                          "a datafile (size = %lld).\n",
<>395 -                         llu(s_op->u.getattr.handle),
  395+                         llu(s_op->req->u.getattr.handle),
396396                          lld(resp_attr->u.data.size));
 397397             break;
 398398         case PVFS_TYPE_DIRECTORY:
 399399             PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "type: directory\n");
<>400 -            if (s_op->u.getattr.attrmask & PVFS_ATTR_DIR_DIRENT_COUNT)
  400+            if (s_op->req->u.getattr.attrmask & PVFS_ATTR_DIR_DIRENT_COUNT)
401401             {
 402402                 gossip_debug(GOSSIP_GETATTR_DEBUG,
 403403                              " getattr: dirent_count needed.\n");
      
 !
 
…
412412                 js_p->error_code = 0;
 413413                 assert(resp_attr->mask & PVFS_ATTR_COMMON_ALL);
 414414             }
<>415 -            if (s_op->u.getattr.attrmask & PVFS_ATTR_DIR_HINT)
  415+            if (s_op->req->u.getattr.attrmask & PVFS_ATTR_DIR_HINT)
416416             {
 417417                 gossip_debug(GOSSIP_GETATTR_DEBUG,
 418418                             " getattr: dfile_count needed.\n");
      
 !
 
…
432432             gossip_debug(
 433433                 GOSSIP_GETATTR_DEBUG, "  handle %llu refers to "
 434434                 "a dirdata object. doing nothing special\n",
<>435 -                llu(s_op->u.getattr.handle));
  435+                llu(s_op->req->u.getattr.handle));
436436             assert(resp_attr->mask & PVFS_ATTR_COMMON_ALL);
 437437             break;
 438438         case PVFS_TYPE_SYMLINK:
 439439             PINT_ACCESS_DEBUG(s_op, GOSSIP_ACCESS_DEBUG, "type: symlink\n");
 440440             gossip_debug(
 441441                 GOSSIP_GETATTR_DEBUG, "  handle %llu refers to a symlink.\n",
<>442 -                llu(s_op->u.getattr.handle));
  442+                llu(s_op->req->u.getattr.handle));
443443 
 444444             /*
 445445               we'll definitely have to fetch the symlink target in this
      
 !
 
…
459459             gossip_err(
 460460                 "Error: got unknown type when verifying attributes for "
 461461                 "handle %llu.\n", 
<>462 -                llu(s_op->u.getattr.handle));
  462+                llu(s_op->req->u.getattr.handle));
463463             js_p->error_code = -PVFS_ENXIO;
 464464             break;
 465465     }
      
 !
 
…
475475     job_id_t i;
 476476 
 477477     /* if we don't need to fill in the symlink target, skip it */
<>478 -    if (!(s_op->u.getattr.attrmask & PVFS_ATTR_SYMLNK_TARGET))
  478+    if (!(s_op->req->u.getattr.attrmask & PVFS_ATTR_SYMLNK_TARGET))
479479     {
 480480         gossip_debug(GOSSIP_GETATTR_DEBUG, "skipping symlink target read\n");
 481481         js_p->error_code = 0;
      
 !
 
…
510510     s_op->free_val = 0;
 511511 
 512512     ret = job_trove_keyval_read(
<>513 -        s_op->u.getattr.fs_id, s_op->u.getattr.handle,
  513+        s_op->req->u.getattr.fs_id, s_op->req->u.getattr.handle,
514514         &s_op->key, &s_op->val,
 515515         0,
 516516         NULL, smcb, 0, js_p,
      
 !
 
…
598598     gossip_debug(GOSSIP_GETATTR_DEBUG,
 599599                  "  reading metafile hint (coll_id = %d, "
 600600                  "handle = %llu, key = %s (%d), val_buf = %p (%d))\n",
<>601 -                 s_op->u.getattr.fs_id,
 602 -                 llu(s_op->u.getattr.handle), (char *)s_op->key.buffer,
  601+                 s_op->req->u.getattr.fs_id,
  602+                 llu(s_op->req->u.getattr.handle), (char *)s_op->key.buffer,
603603                  s_op->key.buffer_sz, s_op->val.buffer,
 604604                  s_op->val.buffer_sz);
 605605 
 606606     ret = job_trove_keyval_read(
<>607 -        s_op->u.getattr.fs_id, s_op->u.getattr.handle,
  607+        s_op->req->u.getattr.fs_id, s_op->req->u.getattr.handle,
608608         &s_op->key, &s_op->val, 
 609609         0, 
 610610         NULL, smcb, 0, js_p,
      
 !
 
…
626626     js_p->error_code = 0;
 627627 
 628628     /* if we don't need to fill in the dfiles, skip them */
<>629 -    if (!(s_op->u.getattr.attrmask & PVFS_ATTR_META_DFILES))
  629+    if (!(s_op->req->u.getattr.attrmask & PVFS_ATTR_META_DFILES))
630630     {
 631631         gossip_debug(GOSSIP_GETATTR_DEBUG, "skipping data handle read\n");
 632632         return SM_ACTION_COMPLETE;
      
 !
 
…
659659             (int)s_op->resp.u.getattr.attr.u.meta.dist_size);
 660660 
 661661         gossip_err("handle: %llu (%llx), fsid: %d.\n",
<>662 -            llu(s_op->u.getattr.handle), llu(s_op->u.getattr.handle),
 663 -            (int)s_op->u.getattr.fs_id);
  662+            llu(s_op->req->u.getattr.handle), llu(s_op->req->u.getattr.handle),
  663+            (int)s_op->req->u.getattr.fs_id);
664664 
 665665         /*If we hit an error the DIST & DFILES are no longer valid*/
 666666         s_op->resp.u.getattr.attr.mask &= ~PVFS_ATTR_META_DIST;
      
 !
 
…
699699     gossip_debug(GOSSIP_GETATTR_DEBUG,
 700700                  "  reading %d datafile handles (coll_id = %d, "
 701701                  "handle = %llu, key = %s (%d), val_buf = %p (%d))\n",
<>702 -                 dfile_count, s_op->u.getattr.fs_id,
 703 -                 llu(s_op->u.getattr.handle), (char *)s_op->key.buffer,
  702+                 dfile_count, s_op->req->u.getattr.fs_id,
  703+                 llu(s_op->req->u.getattr.handle), (char *)s_op->key.buffer,
704704                  s_op->key.buffer_sz, s_op->val.buffer,
 705705                  s_op->val.buffer_sz);
 706706 
 707707     ret = job_trove_keyval_read(
<>708 -        s_op->u.getattr.fs_id
 709 -       ,s_op->u.getattr.handle
  708+        s_op->req->u.getattr.fs_id
  709+       ,s_op->req->u.getattr.handle
710710        ,&s_op->key
 711711        ,&s_op->val
 712712        ,0
      
 !
 
…
738738     {
 739739         gossip_debug(GOSSIP_MIRROR_DEBUG,"\tMirroring is NOT turned on "
 740740                                          "for this handle(%llu)..\n"
<>741 -                                        ,llu(s_op->u.getattr.handle));
  741+                                        ,llu(s_op->req->u.getattr.handle));
742742         js_p->error_code = SKIP_NEXT_STATE;
 743743 
 744744         return SM_ACTION_COMPLETE;
 745745     }
 746746 
 747747     gossip_debug(GOSSIP_MIRROR_DEBUG,"\tMirroring IS turned on for this "
 748748                                      "handle(%llu)...\n"
<>749 -                                    ,llu(s_op->u.getattr.handle));
  749+                                    ,llu(s_op->req->u.getattr.handle));
750750 
 751751     js_p->error_code = 0;
 752752 
      
 !
 
…
771771 
 772772     /* submit job to read the value */
 773773     ret = job_trove_keyval_read(
<>774 -        s_op->u.getattr.fs_id
 775 -       ,s_op->u.getattr.handle
  774+        s_op->req->u.getattr.fs_id
  775+       ,s_op->req->u.getattr.handle
776776        ,&s_op->key
 777777        ,&s_op->val
 778778        ,0
      
 !
 
…
941941    
 942942    /* call job to retrieve the key/val pairs */
 943943    ret = job_trove_keyval_read_list(
<>944 -          s_op->u.getattr.fs_id
 945 -         ,s_op->u.getattr.handle
  944+          s_op->req->u.getattr.fs_id
  945+         ,s_op->req->u.getattr.handle
946946          ,s_op->key_a
 947947          ,s_op->val_a
 948948          ,s_op->error_a
      
 !
 
…
11181118     js_p->error_code = 0;
 11191119 
 11201120     /* if we don't need to fill in the distribution, skip it */
<>1121 -    if (!(s_op->u.getattr.attrmask & PVFS_ATTR_META_DIST))
  1121+    if (!(s_op->req->u.getattr.attrmask & PVFS_ATTR_META_DIST))
11221122     {
 11231123         gossip_debug(GOSSIP_GETATTR_DEBUG, "skipping data handle "
 11241124                      "distribution read\n");
      
 !
 
…
11361136     if (s_op->resp.u.getattr.attr.u.meta.dist_size < 1)
 11371137     {
 11381138         gossip_err("Cannot Read Dist!  Got an invalid dist size for "
<>1139 -                   "handle %llu,%d\n",llu(s_op->u.getattr.handle),
 1140 -                   s_op->u.getattr.fs_id);
  1139+                   "handle %llu,%d\n",llu(s_op->req->u.getattr.handle),
  1140+                   s_op->req->u.getattr.fs_id);
11411141         js_p->error_code = -PVFS_EINVAL;
 11421142         return SM_ACTION_COMPLETE;
 11431143     }
      
 !
 
…
11621162     s_op->free_val = 1;
 11631163 
 11641164     ret = job_trove_keyval_read(
<>1165 -        s_op->u.getattr.fs_id, s_op->u.getattr.handle,
  1165+        s_op->req->u.getattr.fs_id, s_op->req->u.getattr.handle,
11661166         &(s_op->key), &(s_op->val),
 11671167         0,
 11681168         NULL,
      
 !
 
…
12041204     s_op->resp.u.getattr.attr.mask &= (~(PVFS_ATTR_META_UNSTUFFED));
 12051205 
 12061206     return(job_trove_dspace_getattr(
<>1207 -        s_op->u.getattr.fs_id,
  1207+        s_op->req->u.getattr.fs_id,
12081208         s_op->resp.u.getattr.attr.u.meta.dfile_array[0],
 12091209         smcb,
 12101210         &s_op->ds_attr,
      
 !
 
…
12481248         return SM_ACTION_COMPLETE;
 12491249     }
 12501250 
<>1251 -    if(s_op->u.getattr.attrmask & PVFS_ATTR_META_DIST)
  1251+    if(s_op->req->u.getattr.attrmask & PVFS_ATTR_META_DIST)
12521252     {
 12531253         /* successfully read dist key; make sure we got something valid */
 12541254         if(s_op->val.read_sz != s_op->val.buffer_sz)
      
 !
 
…
12731273 
 12741274         if(resp_attr->u.meta.dist == 0) {
 12751275             gossip_err("Found dist of 0 for handle %llu,%d\n",
<>1276 -                    llu(s_op->u.getattr.handle), s_op->u.getattr.fs_id);
  1276+                    llu(s_op->req->u.getattr.handle), s_op->req->u.getattr.fs_id);
12771277             PVFS_perror("Metafile getattr_setup_resp",js_p->error_code);
 12781278             js_p->error_code = -PVFS_EIO;
 12791279             return SM_ACTION_COMPLETE;
      
 !
 
…
13711371         else
 13721372         {
 13731373             gossip_err("Failed to retrieve symlink target path for "
<>1374 -                       "handle %llu,%d\n",llu(s_op->u.getattr.handle),
 1375 -                       s_op->u.getattr.fs_id);
  1374+                       "handle %llu,%d\n",llu(s_op->req->u.getattr.handle),
  1375+                       s_op->req->u.getattr.fs_id);
13761376             PVFS_perror("Symlink retrieval failure",js_p->error_code);
 13771377 
 13781378             free_nested_getattr_data(s_op);
      
 !
 
…
14741474 static PINT_sm_action getattr_setup_op(
 14751475         struct PINT_smcb *smcb, job_status_s *js_p)
 14761476 {
<>1477 -    struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
 1478 -    s_op->u.getattr.handle = s_op->req->u.getattr.handle;
 1479 -    s_op->u.getattr.fs_id = s_op->req->u.getattr.fs_id;
 1480 -    s_op->u.getattr.attrmask = s_op->req->u.getattr.attrmask;
 1481 -
14821477     js_p->error_code = 0;
 14831478     return SM_ACTION_COMPLETE;
 14841479 }
      
 !
 
…
14891484     struct PINT_server_op *s_op = PINT_sm_frame(smcb, PINT_FRAME_CURRENT);
 14901485 
 14911486     if((js_p->error_code == 0) &&
<>1492 -        (s_op->u.getattr.attrmask & PVFS_ATTR_META_DFILES))
  1487+        (s_op->req->u.getattr.attrmask & PVFS_ATTR_META_DFILES))
14931488     {
 14941489         /* successfully read datafile key; make sure we got something valid */
 14951490         if(s_op->val.read_sz != s_op->val.buffer_sz)
      
 !
 
…
15341529     s_op->free_val = 0;
 15351530 
 15361531     ret = job_trove_keyval_read(
<>1537 -        s_op->u.getattr.fs_id, s_op->u.getattr.handle,
  1532+        s_op->req->u.getattr.fs_id, s_op->req->u.getattr.handle,
15381533         &s_op->key, &s_op->val,
 15391534         0,
 15401535         NULL,
      
 !
 
…
15541549     int ret;
 15551550     job_id_t tmp_id;
 15561551 
<>1557 -    if (!(s_op->u.getattr.attrmask & PVFS_ATTR_DIR_DIRENT_COUNT))
  1552+    if (!(s_op->req->u.getattr.attrmask & PVFS_ATTR_DIR_DIRENT_COUNT))
15581553     {
 15591554          /* the caller didn't really want the dirent count; skip to get
 15601555           * directory hints
      
 !
 
…
15631558          return SM_ACTION_COMPLETE;
 15641559     }
 15651560     ret = job_trove_keyval_get_handle_info(
<>1566 -        s_op->u.getattr.fs_id,
  1561+        s_op->req->u.getattr.fs_id,
15671562         s_op->u.getattr.dirent_handle,
 15681563         TROVE_KEYVAL_HANDLE_COUNT |
 15691564         0,
      
 !
 
…
16121607      * function 
 16131608      */
 16141609    
<>1615 -    if (!(s_op->u.getattr.attrmask & PVFS_ATTR_DIR_HINT))
  1610+    if (!(s_op->req->u.getattr.attrmask & PVFS_ATTR_DIR_HINT))
16161611     {
 16171612         /* the caller didn't really want the dir hints; skip
 16181613          */
      
 !
 
…
16261621                  Trove_Special_Keys[DIST_NAME_KEY].key,
 16271622                  Trove_Special_Keys[DIST_PARAMS_KEY].key, 
 16281623                  Trove_Special_Keys[NUM_DFILES_KEY].key,
<>1629 -                 s_op->u.getattr.fs_id, llu(s_op->u.getattr.handle));
  1624+                 s_op->req->u.getattr.fs_id, llu(s_op->req->u.getattr.handle));
16301625 
 16311626     s_op->resp.u.getattr.attr.u.dir.hint.dist_params = 
 16321627         (char *) calloc(1, PVFS_REQ_LIMIT_DIST_BYTES);
      
 !
 
…
17031698 
 17041699     js_p->error_code = 0;
 17051700     ret = job_trove_keyval_read_list(
<>1706 -        s_op->u.getattr.fs_id, 
 1707 -        s_op->u.getattr.handle,
  1701+        s_op->req->u.getattr.fs_id, 
  1702+        s_op->req->u.getattr.handle,
17081703         s_op->key_a, s_op->val_a, s_op->u.getattr.err_array, NUM_SPECIAL_KEYS,
 17091704         0, NULL, smcb, 0, js_p, &tmp_id,
 17101705         server_job_context, s_op->req->hints);
      
 !
 
…
18251820     s_op->free_val = 0;
 18261821 
 18271822     return(job_trove_keyval_read(
<>1828 -        s_op->u.getattr.fs_id, 
 1829 -        s_op->u.getattr.handle,
  1823+        s_op->req->u.getattr.fs_id, 
  1824+        s_op->req->u.getattr.handle,
<_18301825         &(s_op->key), 
 18311826         &(s_op->val), 
 18321827         0,