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

Timestamp:

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

Author:

dcypher

Message:

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

Files:

• branches/orange-next/src/kernel/linux-2.6/super.c (modified) (14 diffs)

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 */