Changeset 8994

Timestamp:

08/05/11 14:23:00 (22 months ago)

Author:

dcypher

Message:

replaced %llu->%s for (PVFS|TROVE)_handle

Location:

branches/orange-next

Files:

• src/client/sysint/sys-setattr.sm (modified) (1 diff)
• src/client/sysint/sys-small-io.sm (modified) (5 diffs)
• src/client/sysint/sys-symlink.sm (modified) (3 diffs)
• src/common/misc/fsck-utils.c (modified) (10 diffs)
• src/common/misc/mkspace.c (modified) (5 diffs)
• src/common/misc/mmap-ra-cache.c (modified) (2 diffs)
• src/common/misc/msgpairarray.sm (modified) (1 diff)
• src/io/trove/trove-dbpf/dbpf-bstream-direct.c (modified) (1 diff)
• src/io/trove/trove-dbpf/dbpf-dspace.c (modified) (11 diffs)
• src/io/trove/trove-dbpf/dbpf-keyval-pcache.c (modified) (5 diffs)
• src/io/trove/trove-dbpf/dbpf-keyval.c (modified) (1 diff)
• src/io/trove/trove-dbpf/dbpf-sync.c (modified) (5 diffs)
• src/io/trove/trove-migrate.c (modified) (1 diff)
• src/kernel/linux-2.6/acl.c (modified) (9 diffs)
• src/kernel/linux-2.6/dcache.c (modified) (2 diffs)
• src/kernel/linux-2.6/file.c (modified) (4 diffs)
• src/kernel/linux-2.6/inode.c (modified) (4 diffs)
• src/kernel/linux-2.6/namei.c (modified) (4 diffs)
• src/kernel/linux-2.6/pvfs2-utils.c (modified) (24 diffs)
• src/kernel/linux-2.6/super.c (modified) (14 diffs)
• src/kernel/linux-2.6/symlink.c (modified) (2 diffs)
• test/client/sysint/create-with-dist.c (modified) (1 diff)
• test/client/sysint/create.c (modified) (1 diff)
• test/client/sysint/create.set.get.eattr.c (modified) (1 diff)
• test/client/sysint/dmkdir.c (modified) (3 diffs)
• test/client/sysint/find.c (modified) (2 diffs)
• test/client/sysint/get-info.c (modified) (1 diff)
• test/client/sysint/io-test.c (modified) (1 diff)
• test/client/sysint/lookup.c (modified) (1 diff)
• test/client/sysint/mkdir.c (modified) (1 diff)
• test/client/sysint/set-info.c (modified) (1 diff)
• test/client/sysint/test-accesses.c (modified) (2 diffs)
• test/client/sysint/test-pint-bucket.c (modified) (2 diffs)
• test/client/sysint/test-pint-ncache.c (modified) (4 diffs)
• test/correctness/pts/test-path-lookup.c (modified) (18 diffs)
• test/io/trove/trove-ls.c (modified) (2 diffs)
• test/server/showconfig.c (modified) (1 diff)

branches/orange-next/src/client/sysint/sys-setattr.sm

@@ -136 +136 @@
     } 
 
-    gossip_debug(GOSSIP_CLIENT_DEBUG, "Doing setattr on handle %llu "
-                 "on fs %d\n", llu(ref.handle),
+    gossip_debug(GOSSIP_CLIENT_DEBUG, "Doing setattr on handle %s "
+                 "on fs %d\n", PVFS_handle_to_str(ref.handle),
                  ref.fs_id);
 

branches/orange-next/src/client/sysint/sys-small-io.sm

@@ -123 +123 @@
 
         gossip_debug(GOSSIP_IO_DEBUG, "   small_io_setup_msgpairs: "
-                     "handle: %llu\n", llu(datafile_handle));
+                     "handle: %s\n", PVFS_handle_to_str(datafile_handle));
 
         if(sm_p->u.io.io_type == PVFS_IO_WRITE)
@@ -378 +378 @@
     */
 
-    gossip_debug(GOSSIP_IO_DEBUG,"handle=%llu \toperation=%d \toffset=%ld "
+    gossip_debug(GOSSIP_IO_DEBUG,"handle=%s \toperation=%d \toffset=%ld "
                              "\taggregate_size=%ld\n",
-                            llu(msg_p->req.u.small_io.handle),
+                            PVFS_handle_to_str(msg_p->req.u.small_io.handle),
                             msg_p->req.u.small_io.io_type,
                             ((long int)msg_p->req.u.small_io.file_req_offset),
@@ -504 +504 @@
             {
                gossip_lerr("Unable to determine the server address "
-                           "for this handle (%llu)"
-                           ,llu(msg->handle));
+                           "for this handle (%s)"
+                           ,PVFS_handle_to_str(msg->handle));
                js_p->error_code = ret;
                return SM_ACTION_COMPLETE;
@@ -546 +546 @@
            {
               gossip_lerr("Unable to determine the server address "
-                          "for this handle (%llu)"
-                          ,llu(msg->handle));
+                          "for this handle (%s)"
+                          ,PVFS_handle_to_str(msg->handle));
               js_p->error_code = ret;
               return SM_ACTION_COMPLETE;
@@ -563 +563 @@
         {
            gossip_lerr("Unable to determine the server address "
-                       "for this handle (%llu)"
-                       ,llu(msg->handle));
+                       "for this handle (%s)"
+                       ,PVFS_handle_to_str(msg->handle));
            js_p->error_code = ret;
            return SM_ACTION_COMPLETE;

branches/orange-next/src/client/sysint/sys-symlink.sm

@@ -205 +205 @@
 
     gossip_debug(
-        GOSSIP_CLIENT_DEBUG, "Symlinking %s under parent handle %llu "
-        "on fs %d to %s\n", entry_name, llu(parent_ref.handle),
+        GOSSIP_CLIENT_DEBUG, "Symlinking %s under parent handle %s "
+        "on fs %d to %s\n", entry_name, PVFS_handle_to_str(parent_ref.handle),
         parent_ref.fs_id, target);
 
@@ -311 +311 @@
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, "*** Got newly created symlink "
-                 "handle %llu\n", llu(sm_p->u.sym.symlink_handle));
+                 "handle %s\n", PVFS_handle_to_str(sm_p->u.sym.symlink_handle));
     return 0;
 }
@@ -553 +553 @@
 
     gossip_debug(GOSSIP_CLIENT_DEBUG, " Preparing to remove "
-                 "metafile handle %llu\n", llu(msg_p->handle));
+                 "metafile handle %s\n", PVFS_handle_to_str(msg_p->handle));
 
     ret = PINT_cached_config_map_to_server(

branches/orange-next/src/common/misc/fsck-utils.c

@@ -354 +354 @@
         if (PINT_handle_wrangler_remove_handle(handle, cur_fs))
         {
-            gossip_err("WARNING: unable to remove handle [%llu] from handle list while verifying stranded objects\n",
-                    llu(*handle));
+            gossip_err("WARNING: unable to remove handle [%s] from handle list while verifying stranded objects\n",
+                    PVFS_handle_to_str(*handle));
         }
     }
@@ -447 +447 @@
             (&obj_ref->handle, &obj_ref->fs_id))
         {
-            gossip_err("WARNING: unable to remove handle [%llu] from \
-                handle list while verifying stranded objects\n", llu(obj_ref->handle));
+            gossip_err("WARNING: unable to remove handle [%s] from \
+                handle list while verifying stranded objects\n", PVFS_handle_to_str(obj_ref->handle));
         }
     }
@@ -567 +567 @@
             (&obj_ref->handle, &obj_ref->fs_id))
         {
-            gossip_err("WARNING: unable to remove handle [%llu] from handle \
-                    list while verifying stranded objects\n", llu(obj_ref->handle));
+            gossip_err("WARNING: unable to remove handle [%s] from handle \
+                    list while verifying stranded objects\n", PVFS_handle_to_str(obj_ref->handle));
         }
     }
@@ -682 +682 @@
         if (PINT_handle_wrangler_remove_handle(handle, cur_fs))
         {
-            gossip_err("WARNING: unable to remove handle [%llu] from handle \
-                    list while verifying stranded objects\n", llu(*handle));
+            gossip_err("WARNING: unable to remove handle [%s] from handle \
+                    list while verifying stranded objects\n", PVFS_handle_to_str(*handle));
         }
     }
@@ -762 +762 @@
             (&obj_ref->handle, &obj_ref->fs_id))
         {
-            gossip_err("WARNING: unable to remove handle [%llu] from \
-                    handle list while verifying stranded objects\n", llu(obj_ref->handle));
+            gossip_err("WARNING: unable to remove handle [%s] from \
+                    handle list while verifying stranded objects\n", PVFS_handle_to_str(obj_ref->handle));
         }
     }
@@ -954 +954 @@
      */
     gossip_debug(GOSSIP_FSCK_DEBUG, "\tFSID        : %d\n", (int) pref->fs_id);
-    gossip_debug(GOSSIP_FSCK_DEBUG, "\tHandle      : %llu\n", llu(pref->handle));
+    gossip_debug(GOSSIP_FSCK_DEBUG, "\tHandle      : %s\n", PVFS_handle_to_str(pref->handle));
 
     if (getattr_resp->attr.mask & PVFS_ATTR_SYS_COMMON_ALL)
@@ -1435 +1435 @@
     {
         PVFS_perror_gossip("PINT_cached_config_map_to_server", ret);
-        gossip_err("Error: could not resolve handle [%llu] to server\n", 
-            llu(*handle));
+        gossip_err("Error: could not resolve handle [%s] to server\n", 
+            PVFS_handle_to_str(*handle));
         return(ret);
     }
@@ -1451 +1451 @@
     if(!found)
     {
-        gossip_err("Error: could not find matching server for handle [%llu]\n",
-            llu(*handle));
+        gossip_err("Error: could not find matching server for handle [%s]\n",
+            PVFS_handle_to_str(*handle));
         return(-PVFS_EINVAL);
     }
@@ -1470 +1470 @@
     if(!found)
     {
-        gossip_err("Error: could not find handle [%llu]\n",
-            llu(*handle));
+        gossip_err("Error: could not find handle [%s]\n",
+            PVFS_handle_to_str(*handle));
         return(-PVFS_EINVAL);
     }
@@ -1570 +1570 @@
                                          &attributes);
                 
-                printf(" %llu   %d  ",
-                       llu(PINT_handle_wrangler_handlelist.list_array[i][j]),
+                printf(" %s   %d  ",
+                       PVFS_handle_to_str(PINT_handle_wrangler_handlelist.list_array[i][j]),
                        *cur_fs);
 

branches/orange-next/src/common/misc/mkspace.c

@@ -193 +193 @@
 
         mkspace_print(verbose,"info: created root directory "
-                      "with handle %llu.\n", llu(new_root_handle));
+                      "with handle %s.\n", PVFS_handle_to_str(new_root_handle));
         PVFS_handle_copy(s_used_handles[0], new_root_handle);
 
@@ -262 +262 @@
 
         mkspace_print(verbose, "info: created dspace for dirents "
-                      "with handle %llu\n", llu(root_dirdata_handle));
+                      "with handle %s\n", PVFS_handle_to_str(root_dirdata_handle));
         PVFS_handle_copy(s_used_handles[1], root_dirdata_handle);
 
@@ -315 +315 @@
 
         mkspace_print(verbose,"info: created lost+found directory "
-                      "with handle %llu.\n", llu(lost_and_found_handle));
+                      "with handle %s.\n", PVFS_handle_to_str(lost_and_found_handle));
         PVFS_handle_copy(s_used_handles[2], lost_and_found_handle);
 
@@ -365 +365 @@
         mkspace_print(
             verbose, "info: created dspace for dirents "
-            "with handle %llu\n", llu(lost_and_found_dirdata_handle));
+            "with handle %s\n", PVFS_handle_to_str(lost_and_found_dirdata_handle));
         PVFS_handle_copy(s_used_handles[3], lost_and_found_dirdata_handle);
 
@@ -437 +437 @@
 
     mkspace_print(verbose, "collection created:\n"
-                  "\troot handle = %llu, coll id = %d, "
+                  "\troot handle = %s, coll id = %d, "
                   "root string = \"%s\"\n",
-                  llu(root_handle), coll_id, ROOT_HANDLE_KEYSTR);
+                  PVFS_handle_to_str(root_handle), coll_id, ROOT_HANDLE_KEYSTR);
     return 0;
 }

branches/orange-next/src/common/misc/mmap-ra-cache.c

@@ -91 +91 @@
 
         gossip_debug(GOSSIP_MMAP_RCACHE_DEBUG, "Inserted mmap ra cache "
-                     "element %llu, %d of size %llu\n",
-                     llu(cache_elem->refn.handle),
+                     "element %s, %d of size %llu\n",
+                     PVFS_handle_to_str(cache_elem->refn.handle),
                      cache_elem->refn.fs_id,
                      llu(cache_elem->data_sz));
@@ -196 +196 @@
 
             gossip_debug(GOSSIP_MMAP_RCACHE_DEBUG, "Flushed mmap ra cache "
-                         "element %llu, %d of size %llu\n",
-                         llu(cache_elem->refn.handle),
+                         "element %s, %d of size %llu\n",
+                         PVFS_handle_to_str(cache_elem->refn.handle),
                          cache_elem->refn.fs_id,
                          llu(cache_elem->data_sz));

branches/orange-next/src/common/misc/msgpairarray.sm

@@ -850 +850 @@
 
             gossip_debug(GOSSIP_MSGPAIR_DEBUG,
-                         " mapped handle %llu to server %lld\n",
-                         llu(msg_p->handle), lld(msg_p->svr_addr));
+                         " mapped handle %s to server %lld\n",
+                         PVFS_handle_to_str(msg_p->handle), lld(msg_p->svr_addr));
         }
     }

branches/orange-next/src/io/trove/trove-dbpf/dbpf-bstream-direct.c

@@ -865 +865 @@
         {
             gossip_debug(GOSSIP_DIRECTIO_DEBUG, 
-                "directio updating size for handle %llu\n", llu(ref.handle));
+                "directio updating size for handle %s\n", PVFS_handle_to_str(ref.handle));
 
             dbpf_open_cache_put(&rw_op->open_ref);

branches/orange-next/src/io/trove/trove-dbpf/dbpf-dspace.c

@@ -467 +467 @@
         case 0:
             gossip_debug(GOSSIP_TROVE_DEBUG, "removed dataspace with "
-                         "handle %llu\n", llu(ref.handle));
+                         "handle %s\n", PVFS_handle_to_str(ref.handle));
             break;
     }
@@ -720 +720 @@
         {
             ret = -dbpf_db_error_to_trove_error(ret);
-            gossip_err("failed to set cursor position at handle: %llu\n",
-                       llu(*(TROVE_handle *)
+            gossip_err("failed to set cursor position at handle: %s\n",
+                       PVFS_handle_to_str(*(TROVE_handle *)
                        op_p->u.d_iterate_handles.position_p));
             goto return_error;
@@ -746 +746 @@
         {
             ret = -dbpf_db_error_to_trove_error(ret);
-            gossip_err("failed to set cursor position at handle: %llu\n",
-                       llu(*(TROVE_handle *)
+            gossip_err("failed to set cursor position at handle: %s\n",
+                       PVFS_handle_to_str(*(TROVE_handle *)
                            op_p->u.d_iterate_handles.position_p));
             goto return_error;
@@ -862 +862 @@
                     op_p->u.d_iterate_handles.handle_array[i-1]) == 0 ))
             {
-                gossip_err("Warning: got duplicate handle %llu.\n", 
-                           llu(*(TROVE_handle*)tmp_handle));
+                gossip_err("Warning: got duplicate handle %s.\n", 
+                           PVFS_handle_to_str(*(TROVE_handle*)tmp_handle));
                 gossip_err("Warning: skipping entry.\n");
                 i--;
@@ -906 +906 @@
                         *op_p->u.d_iterate_handles.count_p]) == 0 )
             {
-                gossip_err("Warning: found duplicate handle: %llu\n", 
-                           llu(*(TROVE_handle*)tmp_handle));
+                gossip_err("Warning: found duplicate handle: %s\n", 
+                           PVFS_handle_to_str(*(TROVE_handle*)tmp_handle));
                 gossip_err("Warning: skipping entry.\n");
             }
@@ -956 +956 @@
                                  *op_p->u.d_iterate_handles.count_p]) == 0) )
     {
-        gossip_err("Warning: found duplicate handle: %llu\n", llu(dummy_handle));
+        gossip_err("Warning: found duplicate handle: %s\n", PVFS_handle_to_str(dummy_handle));
         gossip_err("Warning: skipping entry.\n");
         (*op_p->u.d_iterate_handles.count_p)--;
@@ -1121 +1121 @@
         gossip_debug(
             GOSSIP_TROVE_DEBUG, "ATTRIB: retrieved "
-            "attributes from CACHE for key %llu\n  uid = %d, mode = %d, "
+            "attributes from CACHE for key %s\n  uid = %d, mode = %d, "
             "type = %d, dfile_count = %d, dist_size = %d\n",
-            llu(handle), (int)ds_attr_p->uid, (int)ds_attr_p->mode,
+            PVFS_handle_to_str(handle), (int)ds_attr_p->uid, (int)ds_attr_p->mode,
             (int)ds_attr_p->type, (int)ds_attr_p->dfile_count,
             (int)ds_attr_p->dist_size);
 #endif
         gossip_debug(GOSSIP_DBPF_ATTRCACHE_DEBUG, "dspace_getattr fast "
-                     "path attr cache hit on %llu\n", llu(handle));
+                     "path attr cache hit on %s\n", PVFS_handle_to_str(handle));
         if(ds_attr_p->type == PVFS_TYPE_METAFILE)
         {
@@ -1225 +1225 @@
             gossip_debug(
                 GOSSIP_TROVE_DEBUG, "ATTRIB: retrieved "
-                "attributes from CACHE for key %llu\n  uid = %d, mode = %d, "
+                "attributes from CACHE for key %s\n  uid = %d, mode = %d, "
                 "type = %d, dfile_count = %d, dist_size = %d\n",
-                llu(handle), (int)ds_attr_p->uid, (int)ds_attr_p->mode,
+                PVFS_handle_to_str(handle), (int)ds_attr_p->uid, (int)ds_attr_p->mode,
                 (int)ds_attr_p->type, (int)ds_attr_p->dfile_count,
                 (int)ds_attr_p->dist_size);
@@ -1233 +1233 @@
             gossip_debug(
                 GOSSIP_TROVE_DEBUG, "dspace_getattr_list fast "
-                "path attr cache hit on %llu, uid=%d, mode=%d, type=%d\n",
-                llu(handle_array[i]), (int)ds_attr_p[i].uid, (int)ds_attr_p[i].mode,
+                "path attr cache hit on %s, uid=%d, mode=%d, type=%d\n",
+                PVFS_handle_to_str(handle_array[i]), (int)ds_attr_p[i].uid, (int)ds_attr_p[i].mode,
                 (int)ds_attr_p[i].type);
             if(ds_attr_p[i].type == PVFS_TYPE_METAFILE)
@@ -1449 +1449 @@
     gossip_debug(
         GOSSIP_TROVE_DEBUG, "ATTRIB: retrieved attributes "
-        "from DISK for key %llu\n\tuid = %d, mode = %d, type = %d\n",
-        llu(ref.handle), (int)attr->uid, (int)attr->mode, (int)attr->type);
+        "from DISK for key %s\n\tuid = %d, mode = %d, type = %d\n",
+        PVFS_handle_to_str(ref.handle), (int)attr->uid, (int)attr->mode, (int)attr->type);
     if(attr->type == PVFS_TYPE_METAFILE)
     {
@@ -2131 +2131 @@
     if (ret == 0)
     {
-        gossip_debug(GOSSIP_TROVE_DEBUG, "handle (%llu) already exists.\n",
-                     llu(new_handle));
+        gossip_debug(GOSSIP_TROVE_DEBUG, "handle (%s) already exists.\n",
+                     PVFS_handle_to_str(new_handle));
         return(-TROVE_EEXIST);
     }

branches/orange-next/src/io/trove/trove-dbpf/dbpf-keyval-pcache.c

@@ -179 +179 @@
             gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                          "Trove KeyVal pcache NOTFOUND: "
-                         "handle: %llu, pos: session(%lluu), count(%lluu)\n",
-                         llu(handle), llu(pos.session), llu(pos.count));
+                         "handle: %s, pos: session(%lluu), count(%lluu)\n",
+                         PVFS_handle_to_str(handle), llu(pos.session), llu(pos.count));
         }
         else
@@ -186 +186 @@
             gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                          "Trove KeyVal pcache failed: (error %d): "
-                         "handle: %llu, pos: session(%llu), count(%llu)\n",
-                         ret, llu(handle), llu(pos.session), llu(pos.count));
+                         "handle: %s, pos: session(%llu), count(%llu)\n",
+                         ret, PVFS_handle_to_str(handle), llu(pos.session), llu(pos.count));
         }
 
@@ -200 +200 @@
     gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                  "Trove KeyVal pcache lookup succeeded: "
-                 "handle: %llu, pos: session(%llu), count(%llu)\n",
-                 llu(handle), llu(pos.session), llu(pos.count));
+                 "handle: %s, pos: session(%llu), count(%llu)\n",
+                 PVFS_handle_to_str(handle), llu(pos.session), llu(pos.count));
 
     return 0;
@@ -250 +250 @@
         gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                      "Trove KeyVal pcache insert failed: (error: %d) "
-                     "handle: %llu, pos: session(%llu), count(%llu)\n",
-                     ret, llu(handle), llu(pos.session), llu(pos.count));
+                     "handle: %s, pos: session(%llu), count(%llu)\n",
+                     ret, PVFS_handle_to_str(handle), llu(pos.session), llu(pos.count));
 
         gen_mutex_unlock(&pcache->mutex);
@@ -261 +261 @@
     gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
                  "Trove KeyVal pcache insert succeeded: "
-                 "handle: %llu, pos: session(%llu), count(%llu)\n",
-                 llu(handle), llu(pos.session), llu(pos.count));
+                 "handle: %s, pos: session(%llu), count(%llu)\n",
+                 PVFS_handle_to_str(handle), llu(pos.session), llu(pos.count));
 
     return 0;

branches/orange-next/src/io/trove/trove-dbpf/dbpf-keyval.c

@@ -1660 +1660 @@
     /* not safe to print this if it may be a binary key */
     gossip_debug(GOSSIP_DBPF_KEYVAL_DEBUG,
-                 "PINT_dbpf_keyval_remove: handle (%llu), key: (%d) %*s\n",
-                 llu(handle), key->buffer_sz, key->buffer_sz, (char *)key->buffer);
+                 "PINT_dbpf_keyval_remove: handle (%s), key: (%d) %*s\n",
+                 PVFS_handle_to_str(handle), key->buffer_sz, key->buffer_sz, (char *)key->buffer);
     #endif
 

branches/orange-next/src/io/trove/trove-dbpf/dbpf-sync.c

@@ -129 +129 @@
     gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
                  "[SYNC_COALESCE]: sync_coalesce called, "
-                 "handle: %llu, cid: %d\n",
-                 llu(qop_p->op.handle), cid);
+                 "handle: %s, cid: %d\n",
+                 PVFS_handle_to_str(qop_p->op.handle), cid);
 
     sync_context_type = dbpf_sync_get_object_sync_context(qop_p->op.type);
@@ -140 +140 @@
         gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
                      "[SYNC_COALESCE]: sync not needed, "
-                     "moving to completion queue: %llu\n",
-                     llu(qop_p->op.handle));
+                     "moving to completion queue: %s\n",
+                     PVFS_handle_to_str(qop_p->op.handle));
         dbpf_queued_op_complete(qop_p, OP_COMPLETED);
         return 0;
@@ -225 +225 @@
 
         gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
-                     "[SYNC_COALESCE]: moving op: %p, handle: %llu , type: %d "
+                     "[SYNC_COALESCE]: moving op: %p, handle: %s , type: %d "
                      "to completion queue\n",
-                     qop_p, llu(qop_p->op.handle), qop_p->op.type);
+                     qop_p, PVFS_handle_to_str(qop_p->op.handle), qop_p->op.type);
 
         if(qop_p->event_type == trove_dbpf_dspace_create_event_id)
@@ -261 +261 @@
 
             gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
-                         "[SYNC_COALESCE]: moving op: %p, handle: %llu , type: %d "
+                         "[SYNC_COALESCE]: moving op: %p, handle: %s , type: %d "
                          "to completion queue\n",
-                         ready_op, llu(ready_op->op.handle), ready_op->op.type);
+                         ready_op, PVFS_handle_to_str(ready_op->op.handle), ready_op->op.type);
 
             dbpf_op_queue_remove(ready_op);
@@ -279 +279 @@
         gossip_debug(GOSSIP_DBPF_COALESCE_DEBUG,
                      "[SYNC_COALESCE]:\tcoalescing type: %d "
-                     "coalesce_counter: %d, sync_counter: %d, handle %llu\n", 
+                     "coalesce_counter: %d, sync_counter: %d, handle %s\n", 
                      sync_context_type, sync_context->coalesce_counter,
                      sync_context->sync_counter,
-                     llu(qop_p->op.handle));
+                     PVFS_handle_to_str(qop_p->op.handle));
 
         dbpf_op_queue_add(

branches/orange-next/src/io/trove/trove-migrate.c

@@ -562 +562 @@
                 ret = -1;
                 gossip_err("trove_dspace_getattr_list failure: \
-coll=%d context=%lld handle=%llu state=%d\n",
+coll=%d context=%lld handle=%s state=%d\n",
                            coll_id, lld(context_id),
-                           llu(handles[i]), states[i]);
+                           PVFS_handle_to_str(handles[i]), states[i]);
                 goto complete;
             }

branches/orange-next/src/kernel/linux-2.6/acl.c

@@ -33 +33 @@
 #include "bmi-byteswap.h"
 #include <linux/fs_struct.h>
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 /*
@@ -228 +229 @@
         return ERR_PTR(-ENOMEM);
     }
-    gossip_debug(GOSSIP_ACL_DEBUG, "inode %llu, key %s, type %d\n", 
-            llu(get_handle_from_ino(inode)), key, type);
+    gossip_debug(GOSSIP_ACL_DEBUG, "inode %s, key %s, type %d\n", 
+            PVFS_handle_to_str(get_handle_from_ino(inode)), key, type);
     ret = pvfs2_inode_getxattr(inode, "", key, value, PVFS_MAX_XATTR_VALUELEN);
     /* if the key exists, convert it to an in-memory rep */
@@ -241 +242 @@
     }
     else {
-        gossip_err("inode %llu retrieving acl's failed with error %d\n",
-                llu(get_handle_from_ino(inode)), ret);
+        gossip_err("inode %s retrieving acl's failed with error %d\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)), ret);
         acl = ERR_PTR(ret);
     }
@@ -321 +322 @@
         }
     }
-    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_set_acl: inode %llu, key %s type %d\n",
-            llu(get_handle_from_ino(inode)), name, type);
+    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_set_acl: inode %s, key %s type %d\n",
+            PVFS_handle_to_str(get_handle_from_ino(inode)), name, type);
     /* If we do have an access control list, then we need to encode that! */
     if (acl) 
@@ -720 +721 @@
     struct posix_acl *acl = NULL;
 
-    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_check_acl: called on inode %llu\n",
-            llu(get_handle_from_ino(inode)));
+    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_check_acl: called on inode %s\n",
+            PVFS_handle_to_str(get_handle_from_ino(inode)));
 
     acl = pvfs2_get_acl(inode, ACL_TYPE_ACCESS);
@@ -736 +737 @@
         posix_acl_release(acl);
         gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_check_acl: posix_acl_permission "
-                " (inode %llu, acl %p, mask %x) returned %d\n",
-                 llu(get_handle_from_ino(inode)), acl, mask, error);
+                " (inode %s, acl %p, mask %x) returned %d\n",
+                 PVFS_handle_to_str(get_handle_from_ino(inode)), acl, mask, error);
         return error;
     }
@@ -771 +772 @@
     if (ret != 0)
     {
-        gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission failed: inode: %llu mask = %o"
+        gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission failed: inode: %s mask = %o"
                 "mode = %o current->fsuid = %d "
                 "inode->i_uid = %d, inode->i_gid = %d "
                 "in_group_p = %d "
                 "(ret = %d)\n",
-                llu(get_handle_from_ino(inode)), mask, inode->i_mode, fsuid, 
+                PVFS_handle_to_str(get_handle_from_ino(inode)), mask, inode->i_mode, fsuid, 
                 inode->i_uid, inode->i_gid, 
                 in_group_p(inode->i_gid),
@@ -788 +789 @@
     }
     else {
-        gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission succeeded on inode %llu\n",
-                llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission succeeded on inode %s\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)));
     }
     return ret;
@@ -797 +798 @@
     int error;
 
-    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission: inode: %llu mask = %o"
+    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission: inode: %s mask = %o"
             "mode = %o current->fsuid = %d "
             "inode->i_uid = %d, inode->i_gid = %d"
             "in_group_p = %d\n", 
-            llu(get_handle_from_ino(inode)), mask, mode, fsuid,
+            PVFS_handle_to_str(get_handle_from_ino(inode)), mask, mode, fsuid,
             inode->i_uid, inode->i_gid,
             in_group_p(inode->i_gid));

branches/orange-next/src/kernel/linux-2.6/dcache.c

@@ -13 +13 @@
 #include "pvfs2-kernel.h"
 #include "pvfs2-internal.h"
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 static void __attribute__ ((unused)) print_dentry(struct dentry *entry, int ret);
@@ -130 +131 @@
     /* now perform getattr */
     gossip_debug(GOSSIP_DCACHE_DEBUG,
-                 "%s: doing getattr: inode: %p, handle: %llu)\n",
-                 __func__, inode, llu(get_handle_from_ino(inode)));
+                 "%s: doing getattr: inode: %p, handle: %s)\n",
+                 __func__, inode, PVFS_handle_to_str(get_handle_from_ino(inode)));
     ret = pvfs2_inode_getattr(inode, PVFS_ATTR_SYS_ALL_NOHINT);
     gossip_debug(GOSSIP_DCACHE_DEBUG,

branches/orange-next/src/kernel/linux-2.6/file.c

@@ -17 +17 @@
 #include <linux/fs.h>
 #include <linux/pagemap.h>
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 enum io_type {
@@ -72 +73 @@
     int ret = -EINVAL;
 
-    gossip_debug(GOSSIP_FILE_DEBUG, "pvfs2_file_open: called on %s (inode is %llu)\n",
-                file->f_dentry->d_name.name, llu(get_handle_from_ino(inode)));
+    gossip_debug(GOSSIP_FILE_DEBUG, "pvfs2_file_open: called on %s (inode is %s)\n",
+                file->f_dentry->d_name.name, PVFS_handle_to_str(get_handle_from_ino(inode)));
 
     inode->i_mapping->host = inode;
@@ -511 +512 @@
           {
               gossip_err(
-                    "%s: error in %s handle %llu, "
+                    "%s: error in %s handle %s, "
                     "FILE: %s, returning %ld\n",
                     rw->fnstr, 
                     rw->type == IO_READV ? "vectored read from" : "vectored write to",
-                    llu(get_handle_from_ino(rw->inode)),
+                    PVFS_handle_to_str(get_handle_from_ino(rw->inode)),
                     (rw->file && rw->file->f_dentry && rw->file->f_dentry->d_name.name ?
                      (char *)rw->file->f_dentry->d_name.name : "UNKNOWN"),
@@ -1885 +1886 @@
           {
               gossip_err(
-                "%s: error in %s handle %llu, "
+                "%s: error in %s handle %s, "
                 "FILE: %s\n  -- returning %ld\n",
                 rw->fnstr, 
                 rw->type == IO_READX ? "noncontig read from" : "noncontig write to",
-                llu(get_handle_from_ino(rw->inode)),
+                PVFS_handle_to_str(get_handle_from_ino(rw->inode)),
                 (rw->file && rw->file->f_dentry && rw->file->f_dentry->d_name.name ?
                      (char *) rw->file->f_dentry->d_name.name : "UNKNOWN"),

branches/orange-next/src/kernel/linux-2.6/inode.c

@@ -15 +15 @@
 #include "pvfs2-types.h"
 #include "pvfs2-internal.h"
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 static int read_one_page(struct page *page)
@@ -170 +171 @@
     if (IS_APPEND(inode) || IS_IMMUTABLE(inode))
         return;
-    gossip_debug(GOSSIP_INODE_DEBUG, "pvfs2: pvfs2_truncate called on inode %llu "
-                "with size %ld\n", llu(get_handle_from_ino(inode)), (long) orig_size);
+    gossip_debug(GOSSIP_INODE_DEBUG, "pvfs2: pvfs2_truncate called on inode %s "
+                "with size %ld\n", PVFS_handle_to_str(get_handle_from_ino(inode)), (long) orig_size);
 
     /* successful truncate when size changes also requires mtime updates 
@@ -517 +518 @@
 #endif
     }
-    gossip_debug(GOSSIP_INODE_DEBUG, "iget handle %llu, fsid %d hash %ld i_ino %lu\n",
-                 ref->handle, ref->fs_id, hash, inode->i_ino);
+    gossip_debug(GOSSIP_INODE_DEBUG, "iget handle %s, fsid %d hash %ld i_ino %lu\n",
+                 PVFS_handle_to_str(ref->handle), ref->fs_id, hash, inode->i_ino);
     return inode;
 }
@@ -637 +638 @@
         }
 #if !defined(PVFS2_LINUX_KERNEL_2_4) && defined(HAVE_GENERIC_GETXATTR) && defined(CONFIG_FS_POSIX_ACL)
-        gossip_debug(GOSSIP_ACL_DEBUG, "Initializing ACL's for inode %llu\n", 
-                llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_ACL_DEBUG, "Initializing ACL's for inode %s\n", 
+                PVFS_handle_to_str(get_handle_from_ino(inode)));
         /* Initialize the ACLs of the new inode */
         pvfs2_init_acl(inode, dir);

branches/orange-next/src/kernel/linux-2.6/namei.c

@@ -13 +13 @@
 #include "pvfs2-kernel.h"
 #include "pvfs2-internal.h"
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 /** Get a newly allocated inode to go with a negative dentry.
@@ -113 +114 @@
                 && parent->refn.fs_id != PVFS_FS_ID_NULL)
         {
-            gossip_debug(GOSSIP_NAME_DEBUG, "%s:%s:%d using parent %llu\n",
-              __FILE__, __func__, __LINE__, llu(parent->refn.handle));
+            gossip_debug(GOSSIP_NAME_DEBUG, "%s:%s:%d using parent %s\n",
+              __FILE__, __func__, __LINE__, PVFS_handle_to_str(parent->refn.handle));
             new_op->upcall.req.lookup.parent_refn = parent->refn;
         }
@@ -146 +147 @@
             dentry->d_name.name, PVFS2_NAME_LEN);
 
-    gossip_debug(GOSSIP_NAME_DEBUG, "pvfs2_lookup: doing lookup on %s\n  under %llu,%d "
+    gossip_debug(GOSSIP_NAME_DEBUG, "pvfs2_lookup: doing lookup on %s\n  under %s,%d "
                 "(follow=%s)\n", new_op->upcall.req.lookup.d_name,
-                llu(new_op->upcall.req.lookup.parent_refn.handle),
+                PVFS_handle_to_str(new_op->upcall.req.lookup.parent_refn.handle),
                 new_op->upcall.req.lookup.parent_refn.fs_id,
                 ((new_op->upcall.req.lookup.sym_follow ==
@@ -157 +158 @@
         get_interruptible_flag(dir));
 
-    gossip_debug(GOSSIP_NAME_DEBUG, "Lookup Got %llu, fsid %d (ret=%d)\n",
-                llu(new_op->downcall.resp.lookup.refn.handle),
+    gossip_debug(GOSSIP_NAME_DEBUG, "Lookup Got %s, fsid %d (ret=%d)\n",
+                PVFS_handle_to_str(new_op->downcall.resp.lookup.refn.handle),
                 new_op->downcall.resp.lookup.refn.fs_id, ret);
 

branches/orange-next/src/kernel/linux-2.6/pvfs2-utils.c

@@ -11 +11 @@
 #include "pvfs2-bufmap.h"
 #include "pvfs2-internal.h"
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 int pvfs2_gen_credentials(
@@ -266 +267 @@
             /* special case: mark the root inode as sticky */
             inode->i_mode |= S_ISVTX;
-            gossip_debug(GOSSIP_UTILS_DEBUG, "Marking inode %llu as sticky\n", 
-                    llu(get_handle_from_ino(inode)));
+            gossip_debug(GOSSIP_UTILS_DEBUG, "Marking inode %s as sticky\n", 
+                    PVFS_handle_to_str(get_handle_from_ino(inode)));
         }
 
@@ -436 +437 @@
     pvfs2_inode_t *pvfs2_inode = NULL;
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_inode_getattr: called on inode %llu\n",
-                llu(get_handle_from_ino(inode)));
+    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_inode_getattr: called on inode %s\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)));
 
     if (inode)
@@ -529 +530 @@
 
       copy_attr_failure:
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Getattr on handle %llu, fsid %d\n  (inode ct = %d) "
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Getattr on handle %s, fsid %d\n  (inode ct = %d) "
                     "returned %d\n",
-                    llu(pvfs2_inode->refn.handle), pvfs2_inode->refn.fs_id,
+                    PVFS_handle_to_str(pvfs2_inode->refn.handle), pvfs2_inode->refn.fs_id,
                     (int)atomic_read(&inode->i_count), ret);
         /* store error code in the inode so that we can retrieve it later if
@@ -663 +664 @@
     }
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "*********** pvfs2_flush_inode: %llu "
-            "(ia_valid %d)\n", llu(get_handle_from_ino(inode)), wbattr.ia_valid);
+    gossip_debug(GOSSIP_UTILS_DEBUG, "*********** pvfs2_flush_inode: %s "
+            "(ia_valid %d)\n", PVFS_handle_to_str(get_handle_from_ino(inode)), wbattr.ia_valid);
     if (wbattr.ia_valid == 0)
     {
@@ -671 +672 @@
     }
         
-    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_flush_inode (%llu) writing mode %o\n",
-        llu(get_handle_from_ino(inode)), inode->i_mode);
+    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_flush_inode (%s) writing mode %o\n",
+        PVFS_handle_to_str(get_handle_from_ino(inode)), inode->i_mode);
 
     ret = pvfs2_inode_setattr(inode, &wbattr);
@@ -779 +780 @@
 #endif
 
-        gossip_debug(GOSSIP_XATTR_DEBUG, "getxattr on inode %llu, name %s (uid %o, gid %o)\n", 
-                llu(get_handle_from_ino(inode)), name, fsuid, fsgid);
+        gossip_debug(GOSSIP_XATTR_DEBUG, "getxattr on inode %s, name %s (uid %o, gid %o)\n", 
+                PVFS_handle_to_str(get_handle_from_ino(inode)), name, fsuid, fsgid);
         pvfs2_inode = PVFS2_I(inode);
         /* obtain the xattr semaphore */
@@ -849 +850 @@
                             new_length);
                     ret = new_length;
-                    gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_getxattr: inode %llu key %s "
+                    gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_getxattr: inode %s key %s "
                             " key_sz %d, val_length %d\n", 
-                        llu(get_handle_from_ino(inode)),
+                        PVFS_handle_to_str(get_handle_from_ino(inode)),
                         (char*)new_op->upcall.req.getxattr.key, 
                         (int) new_op->upcall.req.getxattr.key_sz, (int) ret);
@@ -860 +861 @@
         {
             ret = -ENODATA; /* if no such keys exists we set this to be errno */
-            gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_getxattr: inode %llu key %s does not exist!\n",
-                    llu(get_handle_from_ino(inode)), (char *) new_op->upcall.req.getxattr.key);
+            gossip_debug(GOSSIP_XATTR_DEBUG, "pvfs2_inode_getxattr: inode %s key %s does not exist!\n",
+                    PVFS_handle_to_str(get_handle_from_ino(inode)), (char *) new_op->upcall.req.getxattr.key);
         }
 
@@ -922 +923 @@
     if (inode)
     {
-        gossip_debug(GOSSIP_XATTR_DEBUG, "setxattr on inode %llu, name %s\n", 
-                llu(get_handle_from_ino(inode)), name);
+        gossip_debug(GOSSIP_XATTR_DEBUG, "setxattr on inode %s, name %s\n", 
+                PVFS_handle_to_str(get_handle_from_ino(inode)), name);
         if (IS_RDONLY(inode))
         {
@@ -1231 +1232 @@
         get_interruptible_flag(dir));
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "Create Got PVFS2 handle %llu on fsid %d (ret=%d)\n",
-                llu(new_op->downcall.resp.create.refn.handle),
+    gossip_debug(GOSSIP_UTILS_DEBUG, "Create Got PVFS2 handle %s on fsid %d (ret=%d)\n",
+                PVFS_handle_to_str(new_op->downcall.resp.create.refn.handle),
                 new_op->downcall.resp.create.refn.fs_id, ret);
 
@@ -1247 +1248 @@
         }
 
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Assigned file inode new number of %llu\n",
-                    llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Assigned file inode new number of %s\n",
+                    PVFS_handle_to_str(get_handle_from_ino(inode)));
         /* finally, add dentry with this new inode to the dcache */
         gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_create_file: Instantiating\n *negative* "
@@ -1256 +1257 @@
         dentry->d_op = &pvfs2_dentry_operations;
         d_instantiate(dentry, inode);
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Inode (Regular File) %llu -> %s\n",
-                llu(get_handle_from_ino(inode)), dentry->d_name.name);
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Inode (Regular File) %s -> %s\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)), dentry->d_name.name);
     }
     else
@@ -1318 +1319 @@
         get_interruptible_flag(dir));
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "Mkdir Got PVFS2 handle %llu on fsid %d\n",
-                llu(new_op->downcall.resp.mkdir.refn.handle),
+    gossip_debug(GOSSIP_UTILS_DEBUG, "Mkdir Got PVFS2 handle %s on fsid %d\n",
+                PVFS_handle_to_str(new_op->downcall.resp.mkdir.refn.handle),
                 new_op->downcall.resp.mkdir.refn.fs_id);
 
@@ -1334 +1335 @@
         }
 
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Assigned dir inode new number of %llu\n",
-                    llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Assigned dir inode new number of %s\n",
+                    PVFS_handle_to_str(get_handle_from_ino(inode)));
         /* finally, add dentry with this new inode to the dcache */
         gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_create_dir: Instantiating\n  *negative* "
@@ -1343 +1344 @@
         dentry->d_op = &pvfs2_dentry_operations;
         d_instantiate(dentry, inode);
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Inode (Directory) %llu -> %s\n",
-                llu(get_handle_from_ino(inode)), dentry->d_name.name);
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Inode (Directory) %s -> %s\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)), dentry->d_name.name);
     }
     else
@@ -1413 +1414 @@
         get_interruptible_flag(dir));
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "Symlink Got PVFS2 handle %llu on fsid %d (ret=%d)\n",
-                llu(new_op->downcall.resp.sym.refn.handle),
+    gossip_debug(GOSSIP_UTILS_DEBUG, "Symlink Got PVFS2 handle %s on fsid %d (ret=%d)\n",
+                PVFS_handle_to_str(new_op->downcall.resp.sym.refn.handle),
                 new_op->downcall.resp.sym.refn.fs_id, ret);
 
@@ -1429 +1430 @@
         }
 
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Assigned symlink inode new number of %llu\n",
-                    llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Assigned symlink inode new number of %s\n",
+                    PVFS_handle_to_str(get_handle_from_ino(inode)));
 
         /* finally, add dentry with this new inode to the dcache */
@@ -1439 +1440 @@
         dentry->d_op = &pvfs2_dentry_operations;
         d_instantiate(dentry, inode);
-        gossip_debug(GOSSIP_UTILS_DEBUG, "Inode (Symlink) %llu -> %s\n",
-                llu(get_handle_from_ino(inode)), dentry->d_name.name);
+        gossip_debug(GOSSIP_UTILS_DEBUG, "Inode (Symlink) %s -> %s\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)), dentry->d_name.name);
     }
     else
@@ -1516 +1517 @@
     if (inode && parent && dentry)
     {
-        gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_remove_entry: called on %s\n  (inode %llu): "
-                    "Parent is %llu | fs_id %d\n", dentry->d_name.name,
-                    llu(get_handle_from_ino(inode)), llu(parent->refn.handle),
+        gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_remove_entry: called on %s\n  (inode %s): "
+                    "Parent is %s | fs_id %d\n", dentry->d_name.name,
+                    PVFS_handle_to_str(get_handle_from_ino(inode)), PVFS_handle_to_str(parent->refn.handle),
                     parent->refn.fs_id);
 
@@ -1564 +1565 @@
     pvfs2_kernel_op_t *new_op = NULL;
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2: pvfs2_truncate_inode %llu: "
-                "Handle is %llu | fs_id %d | size is %lu\n",
-                llu(get_handle_from_ino(inode)), llu(pvfs2_inode->refn.handle),
+    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2: pvfs2_truncate_inode %s: "
+                "Handle is %s | fs_id %d | size is %lu\n",
+                PVFS_handle_to_str(get_handle_from_ino(inode)), PVFS_handle_to_str(pvfs2_inode->refn.handle),
                 pvfs2_inode->refn.fs_id, (unsigned long)size);
 
@@ -1749 +1750 @@
     ref.handle = opaque_handle.handle;
     ref.fs_id  = opaque_handle.fsid;
-    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_sb_find_inode_handle: obtained inode number %llu\n",
-            llu(opaque_handle.handle));
+    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_sb_find_inode_handle: obtained inode number %s\n",
+            PVFS_handle_to_str(opaque_handle.handle));
     /* 
      * NOTE: Locate the inode number in the icache if possible.
@@ -1913 +1914 @@
     pvfs2_kernel_op_t *new_op = NULL;
 
-    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_flush_mmap_racache %llu: Handle is %llu "
-                "| fs_id %d\n", llu(get_handle_from_ino(inode)),
-                pvfs2_inode->refn.handle, pvfs2_inode->refn.fs_id);
+    gossip_debug(GOSSIP_UTILS_DEBUG, "pvfs2_flush_mmap_racache %s: Handle is %s "
+                "| fs_id %d\n", PVFS_handle_to_str(get_handle_from_ino(inode)),
+                PVFS_handle_to_str(pvfs2_inode->refn.handle), pvfs2_inode->refn.fs_id);
 
     new_op = op_alloc(PVFS2_VFS_OP_MMAP_RA_FLUSH);
@@ -2050 +2051 @@
           associated with the root handle in any case
         */
-        gossip_debug(GOSSIP_UTILS_DEBUG, "*** NOT making bad root inode %llu\n", llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_UTILS_DEBUG, "*** NOT making bad root inode %s\n", PVFS_handle_to_str(get_handle_from_ino(inode)));
     }
     else
     {
-        gossip_debug(GOSSIP_UTILS_DEBUG, "*** making bad inode %llu\n", llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_UTILS_DEBUG, "*** making bad inode %s\n", PVFS_handle_to_str(get_handle_from_ino(inode)));
         make_bad_inode(inode);
     }

branches/orange-next/src/kernel/linux-2.6/super.c

@@ -8 +8 @@
 #include "pvfs2-bufmap.h"
 #include "pvfs2-internal.h"
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 /* list for storing pvfs2 specific superblocks in use */
@@ -219 +220 @@
     if (pvfs2_inode)
     {
-        gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_destroy_inode: deallocated %p destroying inode %llu\n",
-                    pvfs2_inode, llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_destroy_inode: deallocated %p destroying inode %s\n",
+                    pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)));
 
         atomic_inc(&(PVFS2_SB(inode->i_sb)->pvfs2_inode_dealloc_count));
@@ -233 +234 @@
     pvfs2_inode_t *pvfs2_inode = PVFS2_I(inode);
 
-    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_read_inode: %p (inode = %llu | ct = %d)\n",
-                pvfs2_inode, llu(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
+    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_read_inode: %p (inode = %s | ct = %d)\n",
+                pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
 
     /*
@@ -255 +256 @@
     {
         /* assume an I/O error and mark the inode as bad */
-        gossip_debug(GOSSIP_SUPER_DEBUG, "%s:%s:%d calling make bad inode - [%p] (inode = %llu | ct = %d)\n",
-                __FILE__, __func__, __LINE__, pvfs2_inode, llu(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
+        gossip_debug(GOSSIP_SUPER_DEBUG, "%s:%s:%d calling make bad inode - [%p] (inode = %s | ct = %d)\n",
+                __FILE__, __func__, __LINE__, pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
         pvfs2_make_bad_inode(inode);
     }
@@ -299 +300 @@
         if (pvfs2_inode_getattr(inode, PVFS_ATTR_SYS_ALL_NOHINT) != 0)
         {
-            gossip_debug(GOSSIP_SUPER_DEBUG, "%s:%s:%d calling make bad inode - [%p] (inode = %llu | ct = %d)\n",
-                __FILE__, __func__, __LINE__, pvfs2_inode, llu(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
+            gossip_debug(GOSSIP_SUPER_DEBUG, "%s:%s:%d calling make bad inode - [%p] (inode = %s | ct = %d)\n",
+                __FILE__, __func__, __LINE__, pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
             pvfs2_make_bad_inode(inode);
         }
         else {
-            gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2: pvfs2_read_inode: allocated %p (inode = %llu | "
-                    "ct = %d)\n", pvfs2_inode, llu(get_handle_from_ino(inode)),
+            gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2: pvfs2_read_inode: allocated %p (inode = %s | "
+                    "ct = %d)\n", pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)),
                                   (int)atomic_read(&inode->i_count));
         }
@@ -312 +313 @@
     {
         gossip_err("%s:%s:%d Could not allocate pvfs2_inode from pvfs2_inode_cache."
-            "calling make bad inode - [%p] (inode = %llu | ct = %d)\n",
-            __FILE__, __func__, __LINE__, pvfs2_inode, llu(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
+            "calling make bad inode - [%p] (inode = %s | ct = %d)\n",
+            __FILE__, __func__, __LINE__, pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count));
         pvfs2_make_bad_inode(inode);
     }
@@ -322 +323 @@
     pvfs2_inode_t *pvfs2_inode = PVFS2_I(inode);
 
-    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_clear_inode: deallocated %p, destroying inode %llu\n",
-                pvfs2_inode, llu(get_handle_from_ino(inode)));
+    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_clear_inode: deallocated %p, destroying inode %s\n",
+                pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)));
 
     pvfs2_inode_finalize(pvfs2_inode);
@@ -338 +339 @@
 {
     pvfs2_inode_t *pvfs2_inode = PVFS2_I(inode);
-    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_put_inode: pvfs2_inode: %p (inode = %llu) = %d (nlink=%d)\n",
-                pvfs2_inode, llu(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count),
+    gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_put_inode: pvfs2_inode: %p (inode = %s) = %d (nlink=%d)\n",
+                pvfs2_inode, PVFS_handle_to_str(get_handle_from_ino(inode)), (int)atomic_read(&inode->i_count),
                 (int)inode->i_nlink);
 
@@ -895 +896 @@
     {
         pvfs2_inode_t *pvfs2_inode = PVFS2_I(inode);
-        gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_dirty_inode: %llu\n", llu(get_handle_from_ino(inode)));
+        gossip_debug(GOSSIP_SUPER_DEBUG, "pvfs2_dirty_inode: %s\n", PVFS_handle_to_str(get_handle_from_ino(inode)));
         SetAtimeFlag(pvfs2_inode);
     }
@@ -1031 +1032 @@
     root_object.fs_id  = PVFS2_SB(sb)->fs_id;
 
-    gossip_debug(GOSSIP_SUPER_DEBUG, "get inode %llu, fsid %d\n",
-                 root_object.handle, root_object.fs_id);
+    gossip_debug(GOSSIP_SUPER_DEBUG, "get inode %s, fsid %d\n",
+                 PVFS_handle_to_str(root_object.handle), root_object.fs_id);
     /* alloc and initialize our root directory inode by explicitly requesting
      * the sticky bit to be set */
@@ -1110 +1111 @@
    refn.handle |= (u32) fid->raw[1];
    refn.fs_id  = (u32) fid->raw[2];
-   gossip_debug(GOSSIP_SUPER_DEBUG, "fh_to_dentry: handle %llu, fs_id %d\n",
-                refn.handle, refn.fs_id);
+   gossip_debug(GOSSIP_SUPER_DEBUG, "fh_to_dentry: handle %s, fs_id %d\n",
+                PVFS_handle_to_str(refn.handle), refn.fs_id);
 
    inode = pvfs2_iget(sb, &refn);
@@ -1164 +1165 @@
    handle = PVFS2_I(inode)->refn;
    generation = inode->i_generation;
-   gossip_debug(GOSSIP_SUPER_DEBUG, "Encoding fh: handle %llu, gen %u, fsid %u\n",
-                handle.handle, generation, handle.fs_id);
+   gossip_debug(GOSSIP_SUPER_DEBUG, "Encoding fh: handle %s, gen %u, fsid %u\n",
+                PVFS_handle_to_str(handle.handle), generation, handle.fs_id);
 
    len = 3;
@@ -1187 +1188 @@
       len = 6;
       type = 2;
-      gossip_debug(GOSSIP_SUPER_DEBUG, "Encoding parent: handle %llu, gen %u, fsid %u\n",
-                  handle.handle, generation, handle.fs_id);
+      gossip_debug(GOSSIP_SUPER_DEBUG, "Encoding parent: handle %s, gen %u, fsid %u\n",
+                  PVFS_handle_to_str(handle.handle), generation, handle.fs_id);
    }
    *max_len = len;
@@ -1264 +1265 @@
     root_object.handle = PVFS2_SB(sb)->root_handle;
     root_object.fs_id  = PVFS2_SB(sb)->fs_id;
-    gossip_debug(GOSSIP_SUPER_DEBUG, "get inode %llu, fsid %d\n",
-                 root_object.handle, root_object.fs_id);
+    gossip_debug(GOSSIP_SUPER_DEBUG, "get inode %s, fsid %d\n",
+                 PVFS_handle_to_str(root_object.handle), root_object.fs_id);
     /* alloc and initialize our root directory inode. be explicit about sticky
      * bit */

branches/orange-next/src/kernel/linux-2.6/symlink.c

@@ -8 +8 @@
 #include "pvfs2-bufmap.h"
 #include "pvfs2-internal.h"
+#include "../../common/misc/pvfs2-handle-to-str.h"
 
 static int pvfs2_readlink(
@@ -14 +15 @@
     pvfs2_inode_t *pvfs2_inode = PVFS2_I(dentry->d_inode);
 
-    gossip_debug(GOSSIP_INODE_DEBUG, "pvfs2_readlink called on inode %llu\n",
-                llu(get_handle_from_ino(dentry->d_inode)));
+    gossip_debug(GOSSIP_INODE_DEBUG, "pvfs2_readlink called on inode %s\n",
+                PVFS_handle_to_str(get_handle_from_ino(dentry->d_inode)));
 
     /*

branches/orange-next/test/client/sysint/create-with-dist.c

@@ -82 +82 @@
     parent_refn.fs_id = cur_fs;
 
-    printf("File to be created is %s under parent %llu\n",
-           str_buf, llu(parent_refn.handle));
+    printf("File to be created is %s under parent %s\n",
+           str_buf, PVFS_handle_to_str(parent_refn.handle));
 
     /* Lookup the distribution to use */

branches/orange-next/test/client/sysint/create.c

@@ -79 +79 @@
     parent_refn.fs_id = cur_fs;
 
-    printf("File to be created is %s under parent %llu\n",
-           str_buf, llu(parent_refn.handle));
+    printf("File to be created is %s under parent %s\n",
+           str_buf, PVFS_handle_to_str(parent_refn.handle));
 
     ret = PVFS_sys_create(entry_name, parent_refn, attr,

branches/orange-next/test/client/sysint/create.set.get.eattr.c

@@ -86 +86 @@
     parent_refn.fs_id = cur_fs;
 
-    printf("File to be created is %s under parent %llu\n",
-           str_buf, llu(parent_refn.handle));
+    printf("File to be created is %s under parent %s\n",
+           str_buf, PVFS_handle_to_str(parent_refn.handle));
 
     ret = PVFS_sys_create(entry_name, parent_refn, attr,

branches/orange-next/test/client/sysint/dmkdir.c

@@ -95 +95 @@
     // print the handle 
     printf("--mkdir--\n"); 
-    printf("Handle:%llu\n",llu(resp_mkdir.ref.handle));
+    printf("Handle:%s\n",PVFS_handle_to_str(resp_mkdir.ref.handle));
     printf("FSID:%d\n",parent_refn.fs_id);
 
@@ -107 +107 @@
     // print the handle 
     printf("--mkdir--\n"); 
-    printf("Handle:%llu\n",llu(resp_mkdir.ref.handle));
+    printf("Handle:%s\n",PVFS_handle_to_str(resp_mkdir.ref.handle));
     printf("FSID:%d\n",parent_refn.fs_id);
 
@@ -119 +119 @@
     // print the handle 
     printf("--mkdir--\n"); 
-    printf("Handle:%llu\n",llu(resp_mkdir.ref.handle));
+    printf("Handle:%s\n",PVFS_handle_to_str(resp_mkdir.ref.handle));
     printf("FSID:%d\n",parent_refn.fs_id);
 

branches/orange-next/test/client/sysint/find.c

@@ -13 +13 @@
 #include "pvfs2-util.h"
 #include "pvfs2-internal.h"
+#include <pvfs2-handle-to-str.h>
 
 /* TODO: this can be larger after system interface readdir logic
@@ -139 +140 @@
             cur_handle = rd_response.dirent_array[i].handle;
 
-            gossip_debug(GOSSIP_CLIENT_DEBUG,"Got handle %llu\n",
-                         llu(cur_handle));
+            gossip_debug(GOSSIP_CLIENT_DEBUG,"Got handle %s\n",
+                         PVFS_handle_to_str(cur_handle));
 
             is_dir = is_directory(cur_handle,

branches/orange-next/test/client/sysint/get-info.c

@@ -85 +85 @@
     r_ctime = (time_t)resp_gattr->attr.ctime;
 
-    printf("Handle      : %llu\n", llu(pinode_refn.handle));
+    printf("Handle      : %s\n", PVFS_handle_to_str(pinode_refn.handle));
     printf("FSID        : %d\n", (int)pinode_refn.fs_id);
     printf("mask        : %d\n", resp_gattr->attr.mask);

branches/orange-next/test/client/sysint/io-test.c

@@ -235 +235 @@
     for (i = 0; i < resp_getattr.attr.dfile_count; i++)
     {
-        printf("%llu\n", llu(dfile_array[i]));
+        printf("%s\n", PVFS_handle_to_str(dfile_array[i]));
     }
 

branches/orange-next/test/client/sysint/lookup.c

@@ -72 +72 @@
     }
 
-    printf("Handle     : %llu\n", llu(resp_lk.ref.handle));
+    printf("Handle     : %s\n", PVFS_handle_to_str(resp_lk.ref.handle));
     printf("FS ID      : %d\n", resp_lk.ref.fs_id);
 

branches/orange-next/test/client/sysint/mkdir.c

@@ -89 +89 @@
     // print the handle 
     printf("--mkdir--\n"); 
-    printf("Handle:%llu\n",llu(resp_mkdir.ref.handle));
+    printf("Handle:%s\n",PVFS_handle_to_str(resp_mkdir.ref.handle));
     printf("FSID:%d\n",parent_refn.fs_id);
 

branches/orange-next/test/client/sysint/set-info.c

@@ -79 +79 @@
 
     printf("Retrieved the following attributes\n");
-    printf("Handle      : %llu\n", llu(pinode_refn.handle));
+    printf("Handle      : %s\n", PVFS_handle_to_str(pinode_refn.handle));
     printf("FSID        : %d\n", (int)pinode_refn.fs_id);
     printf("mask        : %d\n", resp_getattr.attr.mask);

branches/orange-next/test/client/sysint/test-accesses.c

@@ -7 +7 @@
 #include "pvfs2.h"
 #include "pvfs2-sysint.h"
+#include <pvfs2-handle-to-str.h>
 
 #if PVFS2_SIZEOF_VOIDP == 32 
@@ -118 +119 @@
         if(ret < 0) goto error;
 
-        printf("Performing Write: offset: %llu, size: %d\n",
-               llu(offset), size);
+        printf("Performing Write: offset: %s, size: %d\n",
+               PVFS_handle_to_str(offset), size);
 
         ret = PVFS_sys_io(

branches/orange-next/test/client/sysint/test-pint-bucket.c

@@ -164 +164 @@
                 for(n = 0; n < meta_handle_extent_array.extent_count; n++)
                 {
-                    printf("Meta server %d handle range: %llu-%llu\n", j,
-                           llu(meta_handle_extent_array.extent_array[n].first),
-                           llu(meta_handle_extent_array.extent_array[n].last));
+                    printf("Meta server %d handle range: %s-%s\n", j,
+                           PVFS_handle_to_str(meta_handle_extent_array.extent_array[n].first),
+                           PVFS_handle_to_str(meta_handle_extent_array.extent_array[n].last));
                 }
             }
@@ -189 +189 @@
                 for(n = 0; n < data_handle_extent_array[j].extent_count; n++)
                 {
-                    printf("Data server %d handle range: %llu-%llu\n", n,
-                           llu(data_handle_extent_array[j].extent_array[n].first),
-                           llu(data_handle_extent_array[j].extent_array[n].last));
+                    printf("Data server %d handle range: %s-%s\n", n,
+                           PVFS_handle_to_str(data_handle_extent_array[j].extent_array[n].first),
+                           PVFS_handle_to_str(data_handle_extent_array[j].extent_array[n].last));
                     /* get some contrived test handles */
                     if (test_handle_index < NUM_TEST_HANDLES)

branches/orange-next/test/client/sysint/test-pint-ncache.c

@@ -101 +101 @@
     {
         fprintf(stderr, "Failure: lookup didn't return correct "
-                "handle (%llu != %llu)\n", llu(test_ref.handle),
-                llu(first_ref.handle));
+                "handle (%s != %s)\n", PVFS_handle_to_str(test_ref.handle),
+                PVFS_handle_to_str(first_ref.handle));
         return(-1);
     }
@@ -117 +117 @@
     {
         fprintf(stderr, "Failure: lookup didn't return correct "
-                "handle (%llu != %llu)\n", llu(test_ref.handle),
-                llu(second_ref.handle));
+                "handle (%s != %s)\n", PVFS_handle_to_str(test_ref.handle),
+                PVFS_handle_to_str(second_ref.handle));
         return(-1);
     }
@@ -134 +134 @@
     {
         fprintf(stderr, "Failure: lookup didn't return correct "
-                "handle (%llu != %llu)\n", llu(test_ref.handle),
-                llu(third_ref.handle));
+                "handle (%s != %s)\n", PVFS_handle_to_str(test_ref.handle),
+                PVFS_handle_to_str(third_ref.handle));
         return(-1);
     }
@@ -155 +155 @@
     {
         fprintf(stderr, "Failure: lookup didn't return correct "
-                "handle (%llu != %llu)\n", llu(test_ref.handle),
-                llu(first_ref.handle));
+                "handle (%s != %s)\n", PVFS_handle_to_str(test_ref.handle),
+                PVFS_handle_to_str(first_ref.handle));
         fprintf(stderr, "Failure: lookup didn't return correct handle.\n");
         return(-1);

branches/orange-next/test/correctness/pts/test-path-lookup.c

@@ -15 +15 @@
 #include "pvfs2-req-proto.h"
 #include "pvfs2-internal.h"
+#include <pvfs2-handle-to-str.h>
 
 #define GENERATE_FILENAME(fname, max_len, f, i, r, slash) \
@@ -64 +65 @@
 
         root_refn = lookup_resp.ref;
-        fprintf(stderr,"Got Root Handle %llu on fs %d\n",
-                llu(root_refn.handle), root_refn.fs_id);
+        fprintf(stderr,"Got Root Handle %s on fs %d\n",
+                PVFS_handle_to_str(root_refn.handle), root_refn.fs_id);
 
         attr.mask = PVFS_ATTR_SYS_ALL_SETABLE;
@@ -74 +75 @@
 
         /* make the top-level base directory */
-        fprintf(stderr," Creating base directory %s under %llu, %d\n",
-                PATH_LOOKUP_BASE_DIR, llu(root_refn.handle),
+        fprintf(stderr," Creating base directory %s under %s, %d\n",
+                PATH_LOOKUP_BASE_DIR, PVFS_handle_to_str(root_refn.handle),
                 root_refn.fs_id);
         ret = PVFS_sys_mkdir(PATH_LOOKUP_BASE_DIR, root_refn,
@@ -104 +105 @@
 
             GENERATE_FILENAME(cur_filename, 64, format, i, rank, 0);
-            fprintf(stderr,"  Creating directory %s under %llu, %d\n",
-                    cur_filename, llu(parent_refn.handle),
+            fprintf(stderr,"  Creating directory %s under %s, %d\n",
+                    cur_filename, PVFS_handle_to_str(parent_refn.handle),
                     parent_refn.fs_id);
 
@@ -116 +117 @@
                 goto cleanup;
             }
-            fprintf(stderr, "Got handle %llu\n",
-                    llu(mkdir_resp.ref.handle));
+            fprintf(stderr, "Got handle %s\n",
+                    PVFS_handle_to_str(mkdir_resp.ref.handle));
 
             /* grab refn of newly created directory */
@@ -147 +148 @@
 #if 0
             fprintf(stderr,
-                    " - Looking up relative path %s under %llu, %d\n",
-                    cur_filename, llu(parent_refn.handle),
+                    " - Looking up relative path %s under %s, %d\n",
+                    cur_filename, PVFS_handle_to_str(parent_refn.handle),
                     parent_refn.fs_id);
 #endif
@@ -199 +200 @@
                 fprintf(stderr,"! PVFS_sys_ref_lookup and "
                         "PVFS_sys_lookup returned different results\n"
-                        "\twhen they SHOULD BE THE SAME (%llu != %llu)!\n",
-                        llu(lookup_refns[i].handle),
-                        llu(lookup_resp.ref.handle));
+                        "\twhen they SHOULD BE THE SAME (%s != %s)!\n",
+                        PVFS_handle_to_str(lookup_refns[i].handle),
+                        PVFS_handle_to_str(lookup_resp.ref.handle));
                 goto cleanup;
             }
@@ -227 +228 @@
         GENERATE_FILENAME(cur_filename, 64, format, i, rank, 0);
         fprintf(stderr, "Generating relative symlink %s "
-                "in %llu,%d to point at %s\n", RELATIVE_SYMLINK_NAME,
-                llu(parent_refn.handle),
+                "in %s,%d to point at %s\n", RELATIVE_SYMLINK_NAME,
+                PVFS_handle_to_str(parent_refn.handle),
                 parent_refn.fs_id, cur_filename);
         ret = PVFS_sys_symlink(
@@ -238 +239 @@
             goto symlink_cleanup;
         }
-        fprintf(stderr, "Got handle %llu\n", llu(symlink_resp.ref.handle));
+        fprintf(stderr, "Got handle %s\n", PVFS_handle_to_str(symlink_resp.ref.handle));
 
         /* stash the newly created relative symlink references created */
@@ -244 +245 @@
 
         fprintf(stderr, "Generating absolute symlink %s "
-                "in %llu,%d to point at %s\n", ABSOLUTE_SYMLINK_NAME,
-                llu(parent_refn.handle),
+                "in %s,%d to point at %s\n", ABSOLUTE_SYMLINK_NAME,
+                PVFS_handle_to_str(parent_refn.handle),
                 parent_refn.fs_id, absolute_paths[i]);
         ret = PVFS_sys_symlink(
@@ -255 +256 @@
             goto symlink_cleanup;
         }
-        fprintf(stderr, "Got handle %llu\n", llu(symlink_resp.ref.handle));
+        fprintf(stderr, "Got handle %s\n", PVFS_handle_to_str(symlink_resp.ref.handle));
 
         /* stash the newly created absolute symlink references created */
@@ -292 +293 @@
                  rsymlink_refns[i].fs_id))
             {
-                fprintf(stderr,"\nSymlink %s resolved to %llu "
-                        "but should have resolved to %llu\n", tmp_buf,
-                        llu(lookup_resp.ref.handle),
-                        llu(rsymlink_refns[i].handle));
+                fprintf(stderr,"\nSymlink %s resolved to %s "
+                        "but should have resolved to %s\n", tmp_buf,
+                        PVFS_handle_to_str(lookup_resp.ref.handle),
+                        PVFS_handle_to_str(rsymlink_refns[i].handle));
                 goto symlink_cleanup;
             }
@@ -319 +320 @@
                  lookup_refns[i].fs_id))
             {
-                fprintf(stderr,"\nSymlink %s resolved to %llu "
-                        "but should have resolved to %llu\n", tmp_buf,
-                        llu(lookup_resp.ref.handle),
-                        llu(lookup_refns[i].handle));
+                fprintf(stderr,"\nSymlink %s resolved to %s "
+                        "but should have resolved to %s\n", tmp_buf,
+                        PVFS_handle_to_str(lookup_resp.ref.handle),
+                        PVFS_handle_to_str(lookup_refns[i].handle));
                 goto symlink_cleanup;
             }
@@ -353 +354 @@
                  asymlink_refns[i].fs_id))
             {
-                fprintf(stderr,"\nSymlink %s resolved to %llu "
-                        "but should have resolved to %llu\n", tmp_buf,
-                        llu(lookup_resp.ref.handle),
-                        llu(asymlink_refns[i].handle));
+                fprintf(stderr,"\nSymlink %s resolved to %s "
+                        "but should have resolved to %s\n", tmp_buf,
+                        PVFS_handle_to_str(lookup_resp.ref.handle),
+                        PVFS_handle_to_str(asymlink_refns[i].handle));
                 goto symlink_cleanup;
             }
@@ -380 +381 @@
                  lookup_refns[i].fs_id))
             {
-                fprintf(stderr,"\nSymlink %s resolved to %llu "
-                        "but should have resolved to %llu\n", tmp_buf,
-                        llu(lookup_resp.ref.handle),
-                        llu(lookup_refns[i].handle));
+                fprintf(stderr,"\nSymlink %s resolved to %s "
+                        "but should have resolved to %s\n", tmp_buf,
+                        PVFS_handle_to_str(lookup_resp.ref.handle),
+                        PVFS_handle_to_str(lookup_refns[i].handle));
                 goto symlink_cleanup;
             }
@@ -418 +419 @@
             }
             GENERATE_FILENAME(cur_filename, 64, format, i, rank, 0);
-            fprintf(stderr,"Removing path %s under %llu,%d \t\t... ",
-                    cur_filename, llu(parent_refn.handle),
+            fprintf(stderr,"Removing path %s under %s,%d \t\t... ",
+                    cur_filename, PVFS_handle_to_str(parent_refn.handle),
                     parent_refn.fs_id);
             ret = PVFS_sys_remove(cur_filename, parent_refn, &credentials);
@@ -430 +431 @@
             if (test_symlinks)
             {
-                fprintf(stderr,"Removing rlink %s under %llu,%d \t\t... ",
-                        RELATIVE_SYMLINK_NAME, llu(parent_refn.handle),
+                fprintf(stderr,"Removing rlink %s under %s,%d \t\t... ",
+                        RELATIVE_SYMLINK_NAME, PVFS_handle_to_str(parent_refn.handle),
                         parent_refn.fs_id);
                 ret = PVFS_sys_remove(RELATIVE_SYMLINK_NAME,
@@ -441 +442 @@
                 }
 
-                fprintf(stderr,"Removing alink %s under %llu,%d \t\t... ",
-                        ABSOLUTE_SYMLINK_NAME, llu(parent_refn.handle),
+                fprintf(stderr,"Removing alink %s under %s,%d \t\t... ",
+                        ABSOLUTE_SYMLINK_NAME, PVFS_handle_to_str(parent_refn.handle),
                         parent_refn.fs_id);
                 ret = PVFS_sys_remove(ABSOLUTE_SYMLINK_NAME,

branches/orange-next/test/io/trove/trove-ls.c

@@ -14 +14 @@
 #include "trove-test.h"
 #include "pvfs2-internal.h"
+#include <pvfs2-handle-to-str.h>
 
 char storage_space[SSPACE_SIZE] = "/tmp/trove-test-space";
@@ -152 +153 @@
                 TROVE_DEFAULT_TEST_TIMEOUT);
 
-            printf("%s/%s (handle = %llu, uid = %d, gid = %d, perm = %o, type = %d)\n",
+            printf("%s/%s (handle = %s, uid = %d, gid = %d, perm = %o, type = %d)\n",
                    path_name,
                    (char *) key[i].buffer,
-                   llu(*(TROVE_handle *) val[i].buffer),
+                   PVFS_handle_to_str(*(TROVE_handle *) val[i].buffer),
                    (int) ds_attr.uid,
                    (int) ds_attr.gid,

branches/orange-next/test/server/showconfig.c

@@ -115 +115 @@
                 "===========\n",fs->file_system_name);
         fprintf(stderr,"Collection ID         : %d\n",fs->coll_id);
-        fprintf(stderr,"Root Handle           : %llu\n",
-                llu(fs->root_handle));
+        fprintf(stderr,"Root Handle           : %s\n",
+                PVFS_handle_to_str(fs->root_handle));
         fprintf(stderr,"Handle Recycle Timeout: %d seconds\n",
                 (int)fs->handle_recycle_timeout_sec.tv_sec);