[Ocfs2-commits] jlbec commits r889 - in trunk/src: . inc

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Tue May 4 18:25:02 CDT 2004


Author: jlbec
Date: 2004-05-04 17:25:00 -0500 (Tue, 04 May 2004)
New Revision: 889

Modified:
   trunk/src/Makefile
   trunk/src/alloc.c
   trunk/src/bitmap.c
   trunk/src/dcache.c
   trunk/src/dir.c
   trunk/src/dlm.c
   trunk/src/extmap.c
   trunk/src/file.c
   trunk/src/hash.c
   trunk/src/heartbeat.c
   trunk/src/inc/io.h
   trunk/src/inc/ocfs.h
   trunk/src/inode.c
   trunk/src/io.c
   trunk/src/ioctl.c
   trunk/src/journal.c
   trunk/src/namei.c
   trunk/src/nm.c
   trunk/src/oin.c
   trunk/src/proc.c
   trunk/src/super.c
   trunk/src/symlink.c
   trunk/src/sysfile.c
   trunk/src/util.c
   trunk/src/volcfg.c
   trunk/src/vote.c
Log:

How would you rate your embarrassment at the OCFS2 macros?

A) HI()
B) HILO()
C) GOODEVENING()

HI(), LO(), and HILO() are now gone.  All printk()s are now using %llu
and %lld where appropriate, and all printk() formats are now
warning-free.  This includes the missuse of LOG_EXIT_XXX(), where XXX
was "LONG" and the argument was an "int".  LOG_EXIT_INT() and
LOG_EXIT_UINT() were added for this (so uncommon, suuuure) case.

LOG_EXIT_ARGS() and LOG_ENTER_ARGS() were fixed, because fmt=NULL can't
happen.  LOG_ERROR_ARGS() was fixed to handle a user string with a
newline.

-Wno-format is gone.  If you add a bad format...you break it, you
bought it.  Fix your format.




Modified: trunk/src/Makefile
===================================================================
--- trunk/src/Makefile	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/Makefile	2004-05-04 22:25:00 UTC (rev 889)
@@ -16,7 +16,7 @@
 #-*******************************************************
 # Now do stuff which is global for 2.4.x and 2.6.x builds
 
-WARNINGS = -Wall -Wstrict-prototypes -Wno-format
+WARNINGS = -Wall -Wstrict-prototypes
 
 ifdef OCFS_DEBUG
 OPTS += -g
@@ -56,7 +56,7 @@
 ifneq ($(QUIET),1)
 GLOBAL_DEFINES += -DDEBUG_LOCK_BUFFER
 GLOBAL_DEFINES += -DVERBOSE_BH_JBD_TRACE
-GLOBAL_DEFINES += -DVERBOSE_LOCKING_TRACE
+#GLOBAL_DEFINES += -DVERBOSE_LOCKING_TRACE
 GLOBAL_DEFINES += -DVERBOSE_BH_SEQNUM_TRACE
 GLOBAL_DEFINES += -DVERBOSE_PROCESS_VOTE
 

Modified: trunk/src/alloc.c
===================================================================
--- trunk/src/alloc.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/alloc.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -93,7 +93,7 @@
 	ocfs_free_rec *log;
 	int status = 0, tmpstat;
 
-	LOG_ENTRY_ARGS("(osb=0x%08x, f=0x%08x, f->num_logs = %d)\n", osb, f,
+	LOG_ENTRY_ARGS("(osb=0x%p, f=0x%p, f->num_logs = %d)\n", osb, f,
 		       f->num_logs);
 
 	ocfs_take_trans_lock(osb);
@@ -195,7 +195,7 @@
 	__u64 lock_id;
 	struct buffer_head *globalbh = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, free_log);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, free_log);
 
 #define ALLOC_BLOCK(ptr, len, err)				\
 	do {							\
@@ -917,7 +917,7 @@
 	void *buf;
 	ocfs_file_entry * fe = NULL, *real_fe = NULL;
 
-	LOG_ENTRY_ARGS("(0x%08x, 0x%08x, %llu, %llu\n", osb, fe, disk_off, length);
+	LOG_ENTRY_ARGS("(0x%p, 0x%p, %llu, %llu\n", osb, fe, disk_off, length);
 
 	/* too complicated to deal with both reads and writes to the structure     */
 	/* just save off a copy and replace the fe_bh with the new data at the end */
@@ -1969,7 +1969,7 @@
 		if (IS_VALID_EXTENT_DATA(AllocExtent)) {
 			/* shall we just do away with him? */
 			if (AllocExtent->extents[0].file_off >= newsize) {
-				LOG_TRACE_ARGS("Killing this data extent (%u, %u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+				LOG_TRACE_ARGS("Killing this data extent (%llu)\n", AllocExtent->this_ext);
 				/* Boundary case - what if this guy is
 				 * the last DAT we should delete
 				 * (i.e., split no more ;) */
@@ -1985,7 +1985,7 @@
 			} else {
 				/* Alright, we know for sure that
 				 * we're splitting in this guy. */
-				LOG_TRACE_ARGS("Splitting this data extent (%u, %u)\n", HI(AllocExtent->this_ext), LO(AllocExtent->this_ext));
+				LOG_TRACE_ARGS("Splitting this data extent (%llu)\n", AllocExtent->this_ext);
 				fe->last_ext_ptr = AllocExtent->this_ext;
 				AllocExtent->next_data_ext = 0;
 				/* total_bytes is used below to know
@@ -2107,8 +2107,7 @@
                         if (AllocExtent->next_free_ext == 0) {
 				/*Ok, we're done with this guy, pop the stack*/
                                 LOG_TRACE_ARGS("Popping this header (%llu)\n",
-					       AllocExtent->this_ext, 
-					       AllocExtent->next_free_ext);
+					       AllocExtent->this_ext);
 
 				status = ocfs_handle_add_commit_bits(handle, 1, AllocExtent->alloc_file_off, AllocExtent->alloc_node, DISK_ALLOC_EXTENT_NODE);
 				if (status < 0) {
@@ -2454,7 +2453,7 @@
 	if (extent_bh)
 		brelse(extent_bh);
 
-	LOG_EXIT_ULONG (status);
+	LOG_EXIT_INT (status);
 	return status;
 }  /* ocfs_free_extents_for_truncate */
 
@@ -3379,7 +3378,7 @@
 		buffer++;
 	}
 
-	LOG_EXIT_ULONG (count);
+	LOG_EXIT_ULONG ((unsigned long)count);
 	return(count);
 } /* ocfs_alloc_count_bits */
 
@@ -3889,7 +3888,7 @@
 	__u32 csize = osb->vol_layout.cluster_size;
 	bool use_global = true;
 
-	LOG_ENTRY_ARGS("(file_size = (%llu), handle = 0x%x, sysfile = %s)\n", 
+	LOG_ENTRY_ARGS("(file_size = (%llu), handle = 0x%p, sysfile = %s)\n", 
 		       file_size, handle, sysfile ? "true" : "false");
 
 	if (file_size == 0) {
@@ -4059,7 +4058,7 @@
 	ocfs_bitmap_free_head *f = NULL;
 	struct buffer_head *bh = NULL;
 
-	LOG_ENTRY_ARGS("(local_alloc_bh = 0x%x, sync = %s, "
+	LOG_ENTRY_ARGS("(local_alloc_bh = 0x%p, sync = %s, "
 		       "in_recovery = %s)\n", local_alloc_bh,
 		       sync ? "true" : "false",
 		       in_recovery ? "true" : "false");

Modified: trunk/src/bitmap.c
===================================================================
--- trunk/src/bitmap.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/bitmap.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -42,7 +42,7 @@
 {
 	__u32 tmp;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, %u)\n", bitmap, validbits, allocbits);
+	LOG_ENTRY_ARGS ("(0x%p, %u, %u)\n", bitmap, validbits, allocbits);
 
 	bitmap->validbits = validbits;
 	bitmap->allocbits = allocbits;
@@ -137,7 +137,7 @@
 	int c;
 	struct buffer_head *currbh = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u, %u)\n", osb, bitmap, numBits,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u, %u)\n", osb, bitmap, numBits,
 			offset, sysonly);
 
 	globalsize = bitmap->validbits - sysonly;
@@ -226,7 +226,7 @@
 	else
 		bitoff = -1;
 
-	LOG_EXIT_LONG (bitoff);
+	LOG_EXIT_ULONG ((unsigned long)bitoff);
 	return bitoff;
 }				/* ocfs_find_clear_bits */
 
@@ -258,7 +258,7 @@
 		OCFS_BH_PUT_DATA(currbh);
 	}
 
-	LOG_EXIT_ULONG (count);
+	LOG_EXIT_ULONG ((unsigned long)count);
 	return count;
 }				/* ocfs_count_bits */
 
@@ -277,7 +277,7 @@
 	void *buff;
 	int i, local;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, %u)\n", bitmap, start, num);
+	LOG_ENTRY_ARGS ("(0x%p, %u, %u)\n", bitmap, start, num);
 
 	if ((start + num) > bitmap->validbits) {
 		LOG_ERROR_ARGS("bitmap->validbits = %u but start = %u and "  \
@@ -318,7 +318,7 @@
 	void *buff;
 	int i, local;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, %u)\n", bitmap, start, num);
+	LOG_ENTRY_ARGS ("(0x%p, %u, %u)\n", bitmap, start, num);
 
 	if ((start + num) > bitmap->validbits) {
 		LOG_ERROR_ARGS("bitmap->validbits = %u but start = %u and "  \

Modified: trunk/src/dcache.c
===================================================================
--- trunk/src/dcache.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/dcache.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -51,7 +51,7 @@
 	int flags = nd ? nd->flags : 0;
 #endif
 
-        LOG_ENTRY_ARGS ("(0x%08x, %d, '%*s')\n", dentry, flags,
+        LOG_ENTRY_ARGS ("(0x%p, %d, '%*s')\n", dentry, flags,
                         dentry->d_name.len, dentry->d_name.name);
 
 	if ((inode = dentry->d_inode) == NULL ||
@@ -66,7 +66,7 @@
 
 	/* did we or someone else delete this inode? */
 	if (INODE_DELETED(inode)) {
-		LOG_TRACE_ARGS("dentry_revalidate: inode %lu (%u.%u) deleted, "
+		LOG_TRACE_ARGS("dentry_revalidate: inode %lu (%llu) deleted, "
 			       "returning false\n", inode->i_ino, 
 			       GET_INODE_VOTEOFF(inode));
 		goto bail;
@@ -108,7 +108,7 @@
 
 bail:
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_dentry_revalidate */
 
@@ -138,7 +138,7 @@
 	struct list_head *list;
 	int ret, done;
 
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", dentry,
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	spin_lock (&dcache_lock);
@@ -159,7 +159,7 @@
 	}
 	spin_unlock (&dcache_lock);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_foreach_child */
 

Modified: trunk/src/dir.c
===================================================================
--- trunk/src/dir.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/dir.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -53,7 +53,7 @@
 	int ret = 0;
 	struct inode *inode = filp->f_dentry->d_inode;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", filp, dirent, 
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", filp, dirent, 
                         filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
 
 	pos = filp->f_pos;
@@ -122,12 +122,13 @@
 				    if (r < 0)
 					    break;
 				    entry = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(entry_bh); /* read */
+#warning Do these ino_t (used to be LO(entry->this_sector)) need to be fixed for the inode hash
                                     r=filldir (dirent, entry->filename, strlen (entry->filename), filp->f_pos,
-                                                 LO (entry->this_sector), DT_UNKNOWN);
+                                                 (ino_t)(entry->this_sector & 0xFFFFFFFFULL), DT_UNKNOWN);
                             	    if (r < 0) {
                                     	memcpy(ofile->filldir.fname, entry->filename, OCFS_MAX_FILENAME_LENGTH);
                                     	ofile->filldir.pos = filp->f_pos;
-                                    	ofile->filldir.ino = LO (entry->this_sector);
+                                    	ofile->filldir.ino = (ino_t)(entry->this_sector & 0xFFFFFFFFULL);
 				    }
 			    	    OCFS_BH_PUT_DATA(entry_bh);
 				    brelse(entry_bh);
@@ -149,7 +150,7 @@
 			OCFS_BH_PUT_DATA(entry_bh);
 		brelse(entry_bh);
 	}
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_readdir */
 
@@ -170,7 +171,7 @@
 	int bufsz, nbhs, i;
 	__u32 lock_type = OCFS_DLM_ENABLE_CACHE_LOCK;
 
-	LOG_ENTRY_ARGS ("(osb=%p, parent=%u.%u, fname=%p, fe_bh=%p, ofile=%p, inode=%p)\n", osb, parent_off, file_name, fe_bh, ofile, inode);
+	LOG_ENTRY_ARGS ("(osb=%p, parent=%llu, fname=%p, fe_bh=%p, ofile=%p, inode=%p)\n", osb, parent_off, file_name, fe_bh, ofile, inode);
 
 	nbhs = osb->vol_layout.dir_node_size >> 9;
 	bufsz = nbhs * (sizeof(struct buffer_head *));
@@ -488,7 +489,7 @@
 	if (DirNode)
 		ocfs_safefree(DirNode);
 
-	LOG_EXIT_ULONG (bRet);
+	LOG_EXIT_INT (bRet);
 	return bRet;
 }				/* ocfs_search_dir_node */
 
@@ -603,7 +604,7 @@
 bail:
 	if (DirNode)
 		OCFS_BH_PUT_DATA(bhs[0]);
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_find_index */
 
@@ -1067,9 +1068,9 @@
 	locknode_off = LockNode->node_disk_off;
 	locknode_head_del = LockNode->head_del_ent_node;
 
-	LOG_TRACE_ARGS("ocfs_insert_file: head_del=%u.%u, free_node=%u.%u, locknode=%u.%u\n",
-		       HILO(LockNode->head_del_ent_node), HILO(LockNode->free_node_ptr),
-		       HILO(locknode_off));
+	LOG_TRACE_ARGS("ocfs_insert_file: head_del=%llu, free_node=%llu, locknode=%llu\n",
+		       LockNode->head_del_ent_node, LockNode->free_node_ptr,
+		       locknode_off);
 
 	if (locknode_head_del != INVALID_NODE_POINTER)
 		dir_off = locknode_head_del;
@@ -1078,7 +1079,7 @@
 	else
 		dir_off = locknode_off;
 	
-	LOG_TRACE_ARGS("ocfs_insert_file: dir_off selected was %u.%u\n", HILO(dir_off));
+	LOG_TRACE_ARGS("ocfs_insert_file: dir_off selected was %llu\n", dir_off);
 
 	parent_is_lock_node = (dir_off == locknode_off);
 	OCFS_BH_PUT_DATA(lock_bh);
@@ -1117,7 +1118,7 @@
 	/* start from locknode, travel along next_node_ptr */
 	dir_off = locknode_off;
 	while (1) {
-		LOG_TRACE_ARGS("ocfs_insert_file: now checking %u.%u\n", dir_off);
+		LOG_TRACE_ARGS("ocfs_insert_file: now checking %llu\n", dir_off);
 		status = ocfs_read_dirnode(osb, dir_off, false, bhs, dir_inode);
 		if (status < 0) {
 			LOG_ERROR_STATUS (status);
@@ -1131,12 +1132,13 @@
 		DirNode = NULL;
 
 		if (dir_num_ent_used < osb->max_dir_node_ent) {
-			LOG_TRACE_ARGS("ocfs_insert_file: num_ent_used for %u.%u is good (%d)\n", dir_off, 
+			LOG_TRACE_ARGS("ocfs_insert_file: num_ent_used for %llu is good (%d)\n",
+	       			       dir_off, 
 				       dir_num_ent_used);
 			new_head_del = dir_off;
 			break;
 		}
-		LOG_TRACE_ARGS("ocfs_insert_file: next_node pointer for %u.%u is %u.%u\n", dir_off, dir_next_node);
+		LOG_TRACE_ARGS("ocfs_insert_file: next_node pointer for %llu is %llu\n", dir_off, dir_next_node);
 		dir_off = dir_next_node;
 		if (dir_off == INVALID_NODE_POINTER) {
 			new_head_del = INVALID_NODE_POINTER;

Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/dlm.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -70,11 +70,13 @@
 	bool publish_flag = false;
 	struct buffer_head **bhs = NULL;
 
-	LOG_ENTRY_ARGS ("(osb=0x%08x, id=%u.%u, ty=%u, fl=%u, vm=0x%08x)\n",
-			osb, HILO (lock_id), lock_type, flags, LO (vote_map));
+	LOG_ENTRY_ARGS ("(osb=0x%p, id=%llu, ty=%u, fl=%u, vm=0x%08x)\n",
+			osb, lock_id, lock_type, flags,
+			(__u32)(vote_map & 0xFFFFFFFFULL));
 
-	LOG_TRACE_ARGS ("osb=0x%08x, id=%u.%u, ty=%u, fl=%u, vm=0x%08x\n",
-			osb, HILO (lock_id), lock_type, flags, LO (vote_map));
+	LOG_TRACE_ARGS ("osb=0x%p, id=%llu, ty=%u, fl=%u, vm=0x%08x\n",
+			osb, lock_id, lock_type, flags,
+			(__u32)(vote_map & 0xFFFFFFFFULL));
 
 	pubmap = osb->publ_map;
 	offset = osb->vol_layout.publ_sect_off;
@@ -132,7 +134,7 @@
 	p = OCFS_BH_GET_DATA_WRITE(bhs[osb->node_num]); /* write */
 	pubsect = (ocfs_publish *)p;
 	largestseqno++;
-	LOG_TRACE_ARGS ("largestseqno : %u.%u\n", HILO (largestseqno));
+	LOG_TRACE_ARGS ("largestseqno : %llu\n", largestseqno);
 	osb->publish_dirty = true;
 	pubsect->publ_seq_num = largestseqno;
 	pubsect->dirty = true;
@@ -144,8 +146,8 @@
 
 	OCFS_BH_PUT_DATA(bhs[osb->node_num]);
 #ifdef VERBOSE_LOCKING_TRACE
-	printk("ocfs_disk_request_vote: lockid = %u.%u, "
-	       "fe_off=%u.%u\n", HILO(lock_id), HILO(feoff));
+	printk("ocfs_disk_request_vote: lockid = %llu, "
+	       "fe_off=%llu\n", lock_id, feoff);
 #endif
 	pub_off = osb->vol_layout.publ_sect_off + (osb->node_num * osb->sect_size);
 
@@ -268,8 +270,8 @@
 	__u8 lock_level;
 	bool is_dir = false, disk_vote = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, 0x%08x, %u)\n", osb,
-			HI (offset), LO (offset), time_to_wait,
+	LOG_ENTRY_ARGS ("(0x%p, %llu, %u, 0x%p, %u)\n",
+			osb, offset, time_to_wait,
 			lockres, lock_type);
 
 	while (time_to_wait > timewaited) {
@@ -337,8 +339,8 @@
 					ocfs_release_lockres(lockres);
 					if (status == -EAGAIN) {
 						if (ocfs_task_interruptible (osb)) {
-							LOG_TRACE_ARGS("interrupted... lockid=%u.%u\n",
-								HILO(lockres->sector_num));
+							LOG_TRACE_ARGS("interrupted... lockid=%llu\n",
+								lockres->sector_num);
 							status = -EINTR;
 							goto finally;
 						}
@@ -440,8 +442,9 @@
 	__u8 *p;
 	struct buffer_head **bhs = NULL;
 
-	LOG_ENTRY_ARGS ("(lockid=%u.%u, locktype=%u, votemap=0x%08x)\n",
-			HILO (lock_id), lock_type, LO (vote_map));
+	LOG_ENTRY_ARGS ("(lockid=%llu, locktype=%u, votemap=0x%08x)\n",
+			lock_id, lock_type,
+			(__u32)(vote_map & 0xFFFFFFFFULL));
 
 	numnodes = OCFS_MAXIMUM_NODES;
 
@@ -514,13 +517,13 @@
 	__u64 gotvotemap = 0;
 	__u64 fileopenmap = 0;
 
-	LOG_ENTRY_ARGS ("(osb=0x%08x, id=%u.%u, ty=%u, fl=%u, vm=0x%08x, "
-		"sq:%u.%u)\n", osb, HILO (lock_id), lock_type, flags,
-		LO (vote_map), HILO (lock_seq_num));
+	LOG_ENTRY_ARGS ("(osb=0x%p, id=%llu, ty=%u, fl=%u, vm=0x%08x, "
+		"sq:%llu)\n", osb, lock_id, lock_type, flags,
+		(__u32)(vote_map & 0xFFFFFFFFULL), lock_seq_num);
 
-	LOG_TRACE_ARGS ("osb=0x%08x, id=%u.%u, ty=%u, fl=%u, vm=0x%08x, "
-		"sq=%u.%u\n", osb, HILO (lock_id), lock_type, flags,
-		LO (vote_map), HILO (lock_seq_num));
+	LOG_TRACE_ARGS ("osb=0x%p, id=%llu, ty=%u, fl=%u, vm=0x%08x, "
+		"sq=%llu\n", osb, lock_id, lock_type, flags,
+		(__u32)(vote_map & 0xFFFFFFFFULL), lock_seq_num);
 
 	while (time_to_wait > timewaited) {
 		ocfs_sleep (WAIT_FOR_VOTE_INCREMENT);
@@ -657,7 +660,7 @@
 	bool printed = false;
 #endif
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d)\n", lockres, timeout);
+	LOG_ENTRY_ARGS ("(0x%p, %d)\n", lockres, timeout);
 
 	mypid = ocfs_getpid ();
 
@@ -672,7 +675,7 @@
 				spin_unlock (&lockres->lock_mutex);
 #ifdef VERBOSE_LOCKING_TRACE
 				if (!printed) {
-					printk("ocfs2: waiting on lockres %u.%u, mypid = %u, thread_id = %u\n", HILO(lockres->sector_num), ocfs_getpid(), lockres->thread_id);
+					printk("ocfs2: waiting on lockres %llu, mypid = %u, thread_id = %u\n", lockres->sector_num, ocfs_getpid(), lockres->thread_id);
 					printed = true;
 				}
 #endif
@@ -715,11 +718,11 @@
  */
 void ocfs_release_lockres (ocfs_lock_res * lockres)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", lockres);
+	LOG_ENTRY_ARGS ("(0x%p)\n", lockres);
 
 	spin_lock (&lockres->lock_mutex);
 	if (lockres->in_use == 0) {
-		LOG_ERROR_ARGS("Releasing lockres with inuse 0: 0x%08x\n", lockres);
+		LOG_ERROR_ARGS("Releasing lockres with inuse 0: 0x%p\n", lockres);
 		BUG();
 	} else {
 		if (lockres->thread_id != current->pid)
@@ -842,9 +845,9 @@
 	while (status == -EAGAIN) {
 		if (!IS_NODE_ALIVE (osb->publ_map, lockres->master_node_num,
 				    OCFS_MAXIMUM_NODES)) {
-			LOG_TRACE_ARGS ("Master (%u) dead, lockid %u.%u\n",
+			LOG_TRACE_ARGS ("Master (%u) dead, lockid %llu\n",
 				lockres->master_node_num,
-				HI (lockres->sector_num), LO (lockres->sector_num));
+				lockres->sector_num);
 			status = 0;
 			goto bail;
 		}
@@ -852,9 +855,9 @@
 		ocfs_acquire_lockres (lockres);
 
 		if (lockres->master_node_num == osb->node_num) {
-			LOG_TRACE_ARGS ("Added node to map 0x%08x, lockid %u.%u\n",
-			     LO (lockres->oin_openmap), HI (lockres->sector_num),
-			     LO (lockres->sector_num));
+			LOG_TRACE_ARGS ("Added node to map 0x%08x, lockid %llu\n",
+			     (__u32)(lockres->oin_openmap & 0xFFFFFFFFULL),
+			     lockres->sector_num);
 
 			lockres->oin_openmap |= (1 << osb->node_num);
 			status = ocfs_update_disk_lock (osb, lockres,
@@ -878,8 +881,8 @@
 				if (status == -EAGAIN) {
 					ocfs_sleep (500);
 					if (ocfs_task_interruptible (osb)) {
-						LOG_TRACE_ARGS("interrupted... lockid=%u.%u\n",
-							HILO(lockres->sector_num));
+						LOG_TRACE_ARGS("interrupted... lockid=%llu\n",
+							lockres->sector_num);
 						status = -EINTR;
 						goto bail;
 					}
@@ -903,8 +906,8 @@
  */
 void ocfs_init_lockres (ocfs_super * osb, ocfs_lock_res * lockres, __u64 lock_id)
 {
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u.%u)\n", osb, lockres,
-			HI (lock_id), LO (lock_id));
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %llu)\n", osb, lockres,
+			lock_id);
 
 	lockres->signature = 0x55AA;
 	lockres->lock_type = OCFS_DLM_NO_LOCK;
@@ -939,8 +942,8 @@
 	ocfs_lock_res *tmp_lockres = NULL;
 	bool is_dir = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u)\n", osb,
-			HI (lock_id), LO (lock_id), flags);
+	LOG_ENTRY_ARGS ("(0x%p, %llu, %u)\n",
+			osb, lock_id, flags);
 
 	is_dir = (flags & OCFS_OIN_DIRECTORY) ? true : false;
 
@@ -1091,8 +1094,9 @@
 	bool no_owner = false, owner_dead = false, wait_on_recovery = false;
 	__u32 extra_lock_flags = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x, 0x%08x)\n", osb,
-			HI (lock_id), LO (lock_id), lock_type, flags, ret_lockres, bh);
+	LOG_ENTRY_ARGS ("(0x%p, %llu, %u, %u, 0x%p, 0x%p)\n",
+			osb, lock_id, lock_type, flags,
+			ret_lockres, bh);
 	
 	
 	OCFS_ASSERT(lock_type != OCFS_DLM_NO_LOCK);
@@ -1147,9 +1151,9 @@
 
 	/* master node is an invalid node */
 	if (unlikely(lockres->master_node_num >= OCFS_MAXIMUM_NODES && !no_owner)) {
-		LOG_ERROR_ARGS("lockres: master_node=%d, owner=%s, lockid=%u.%u\n",
+		LOG_ERROR_ARGS("lockres: master_node=%d, owner=%s, lockid=%llu\n",
 			       lockres->master_node_num, no_owner?"no":"yes",
-			       HILO(lockres->sector_num));
+			       lockres->sector_num);
 		LOG_ERROR_STATUS (status = -EINVAL);
 		ocfs_release_lockres (lockres);
 		goto finally;
@@ -1240,7 +1244,7 @@
 #ifdef VERBOSE_LOCKING_TRACE
 	printk("lockres: lockid=%llu, this=%d, master=%d, locktype=%d, flags=%08x, ronode=%d, romap=%08x\n",
 		       lockres->sector_num, osb->node_num, lockres->master_node_num, lockres->lock_type, 
-		       flags|extra_lock_flags, lockres->readonly_node, lockres->readonly_map);
+		       flags|extra_lock_flags, lockres->readonly_node, (__u32)(lockres->readonly_map & 0xFFFFFFFFULL));
 #endif	
 	if (wait_on_recovery && !((flags|extra_lock_flags) & FLAG_FILE_RECOVERY)) {
 		int waitcnt = 0;
@@ -1261,8 +1265,8 @@
 		if (status == -EAGAIN) {
 			ocfs_sleep (500);
 			if (ocfs_task_interruptible (osb)) {
-				LOG_TRACE_ARGS("interrupted... lockid=%u.%u\n",
-					HILO(lockres->sector_num));
+				LOG_TRACE_ARGS("interrupted... lockid=%llu\n",
+					lockres->sector_num);
 				status = -EINTR;
 				goto finally;
 			}
@@ -1314,8 +1318,8 @@
 	int lockflags = (lock_id >= osb->vol_layout.bitmap_off ? OCFS_BH_CACHED : 0);
 	bool clear_tmp = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x)\n", osb, HI (lock_id),
-			LO (lock_id), lock_type, flags, lockres);
+	LOG_ENTRY_ARGS ("(0x%p, %llu, %u, %u, 0x%p)\n",
+			osb, lock_id, lock_type, flags, lockres);
 
 	if (bh != NULL)
 		b = &bh;
@@ -1394,11 +1398,11 @@
 			}
 		}
 
-		LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%u.%u, inode=%u\n",
-		       lock_type, flags, HILO(lock_id), inode?inode->i_ino:0);
+		LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%llu, inode=%lu\n",
+		       lock_type, flags, lock_id, inode?inode->i_ino:0);
 		LOG_ERROR_ARGS("DISKVOTE!!: this=%d, master=%d, locktype=%d, ronode=%d, romap=%08x\n",
 		       osb->node_num, lockres->master_node_num, lockres->lock_type, 
-		       lockres->readonly_node, lockres->readonly_map);
+		       lockres->readonly_node, (__u32)(lockres->readonly_map & 0xFFFFFFFFULL));
 
 		ocfs_show_trace(NULL);
 
@@ -1432,13 +1436,13 @@
 			break;
 
 loop:
-		LOG_TRACE_ARGS ("id=%u.%u\n", HILO(lock_id));
+		LOG_TRACE_ARGS ("id=%llu\n", lock_id);
 		ocfs_sleep (500);
 	}
 
 finally:
 	jif = jiffies - jif;
-	LOG_TRACE_ARGS ("Lock time: %u\n", jif);
+	LOG_TRACE_ARGS ("Lock time: %lu\n", jif);
 
 	if (disk_vote && !disk_reset) {
 		tmpstat = ocfs_reset_voting (osb);
@@ -1495,8 +1499,8 @@
 	int status = 0;
 	int tries = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x)\n", osb, HI (lock_id),
-			LO (lock_id), lock_type, flags, lockres);
+	LOG_ENTRY_ARGS ("(0x%p, %llu, %u, %u, 0x%p)\n",
+			osb, lock_id, lock_type, flags, lockres);
 
 	OCFS_ASSERT(inode);
 
@@ -1589,7 +1593,7 @@
 	while (status == -EAGAIN) {
 		if (!IS_NODE_ALIVE (osb->publ_map, lockres->master_node_num,
 				    OCFS_MAXIMUM_NODES)) {
-			LOG_TRACE_ARGS ("Master (%u) is dead, lockid %u.%u\n",
+			LOG_TRACE_ARGS ("Master (%u) is dead, lockid %llu\n",
 				lockres->master_node_num, lockres->sector_num);
 			/* TODO recovery needs to be done here .....and then become master */
 			status = 0;
@@ -1618,11 +1622,11 @@
 			}
 		}
 		
-		LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%u.%u, inode=%u\n",
-		       lockres->lock_type, FLAG_ACQUIRE_LOCK|FLAG_FILE_RELEASE_CACHE, HILO(lockres->sector_num), inode?inode->i_ino:0);
+		LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%llu, inode=%lu\n",
+		       lockres->lock_type, FLAG_ACQUIRE_LOCK|FLAG_FILE_RELEASE_CACHE, lockres->sector_num, inode?inode->i_ino:0);
 		LOG_ERROR_ARGS("DISKVOTE!!: this=%d, master=%d, locktype=%d, ronode=%d, romap=%08x\n",
 		       osb->node_num, lockres->master_node_num, lockres->lock_type, 
-		       lockres->readonly_node, lockres->readonly_map);
+		       lockres->readonly_node, (__u32)(lockres->readonly_map & 0xFFFFFFFFULL));
 
 		ocfs_show_trace(NULL);
 	
@@ -1670,11 +1674,11 @@
 			break;
 
 loop:
-		LOG_TRACE_ARGS ("id=%u.%u\n", HILO(lockres->sector_num));
+		LOG_TRACE_ARGS ("id=%llu\n", lockres->sector_num);
 		ocfs_sleep (500);
 		if (ocfs_task_interruptible (osb)) {
-			LOG_TRACE_ARGS("interrupted.... lockid=%u.%u\n",
-				HILO(lockres->sector_num));
+			LOG_TRACE_ARGS("interrupted.... lockid=%llu\n",
+				lockres->sector_num);
 			status = -EINTR;
 			goto finito;
 		}
@@ -1692,7 +1696,7 @@
 	}
 
 	jif = jiffies - jif;
-	LOG_TRACE_ARGS ("Lock time: %u\n", jif);
+	LOG_TRACE_ARGS ("Lock time: %lu\n", jif);
 
 	if (disk_vote && !disk_reset) {
 		tmpstat = ocfs_reset_voting (osb);
@@ -1754,11 +1758,11 @@
 			LOG_ERROR_STATUS (status);
 	}
 
-	LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%u.%u, inode=%u\n",
-	       OCFS_DLM_ENABLE_CACHE_LOCK, FLAG_DROP_READONLY, HILO(lock_id), 0);
+	LOG_ERROR_ARGS("DISKVOTE!!: lock_type=%u, flags=%08x, offset=%llu, inode=%lu\n",
+	       OCFS_DLM_ENABLE_CACHE_LOCK, FLAG_DROP_READONLY, lock_id, 0UL);
 	LOG_ERROR_ARGS("DISKVOTE!!: this=%d, master=%d, locktype=%d, ronode=%d, romap=%08x\n",
 	       osb->node_num, lockres->master_node_num, lockres->lock_type, 
-	       lockres->readonly_node, lockres->readonly_map);
+	       lockres->readonly_node, (__u32)(lockres->readonly_map & 0xFFFFFFFFULL));
 
 	ocfs_show_trace(NULL);
 
@@ -1884,11 +1888,11 @@
 	}
 
 
-	LOG_ERROR_ARGS("DISKVOTE!!: req_lock=%u, flags=%08x, offset=%u.%u, inode=%u\n",
-		       requested_lock, flags, HILO(lock_id), inode?inode->i_ino:0);
+	LOG_ERROR_ARGS("DISKVOTE!!: req_lock=%u, flags=%08x, offset=%llu, inode=%lu\n",
+		       requested_lock, flags, lock_id, inode?inode->i_ino:0);
 	LOG_ERROR_ARGS("DISKVOTE!!: this=%d, master=%d, locktype=%d, ronode=%d, romap=%08x\n",
 		       osb->node_num, lockres->master_node_num, lockres->lock_type, 
-		       lockres->readonly_node, lockres->readonly_map);
+		       lockres->readonly_node, (__u32)(lockres->readonly_map & 0xFFFFFFFFULL));
 
 	ocfs_show_trace(NULL);
 

Modified: trunk/src/extmap.c
===================================================================
--- trunk/src/extmap.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/extmap.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -245,7 +245,7 @@
 
 bail:
 
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_coalesce_extent_map_entry */
 
@@ -304,7 +304,7 @@
 	spin_unlock(&(map->lock));
 
 bail:
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_extent_map_add */
 
@@ -385,7 +385,7 @@
 	spin_unlock(&(map->lock));
 
 bail:
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_extent_map_lookup */
 
@@ -430,7 +430,7 @@
 	spin_unlock(&(map->lock));
 bail:
 
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_extent_map_next_entry */
 
@@ -516,10 +516,10 @@
 		Results = false;
 		*SectorCount = 0xffffffffUL;
 	} else {
-		*SectorCount = (LO(LiSectorCount)) << OCFS_LOG_SECTOR_SIZE;
+		*SectorCount = ((__u32)(LiSectorCount & 0xFFFFFFFFULL)) << OCFS_LOG_SECTOR_SIZE;
 	}
 		
-	LOG_EXIT_ULONG (Results);
+	LOG_EXIT_INT (Results);
 	return Results;
 }				/* ocfs_get_next_extent_map_entry  */
 
@@ -566,7 +566,7 @@
 		}
 	}
 
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_lookup_extent_map_entry */
 
@@ -648,8 +648,8 @@
 
 		if ((OcfsExtent->next_free_ext != OCFS_MAX_DATA_EXTENTS) &&
 		    (*remainingLength)) {
-			LOG_ERROR_ARGS ("next_free_extent=%d, rem_len=%u.%u",
-				OcfsExtent->next_free_ext, HILO(*remainingLength));
+			LOG_ERROR_ARGS ("next_free_extent=%d, rem_len=%llu",
+				OcfsExtent->next_free_ext, *remainingLength);
 		} else
 			status = 0;
 	}
@@ -689,10 +689,10 @@
 
 	ret = ocfs_extent_map_add (Map, ((__s64) Vbo), ((__s64) Lbo), ((__s64) ByteCount));
 	if (!ret)
-		LOG_ERROR_ARGS ("fileoff=%u.%u, diskoff=%u.%u, len=%u.%u",
-				HILO (Vbo), HILO (Lbo), HILO (ByteCount));
+		LOG_ERROR_ARGS ("fileoff=%llu, diskoff=%llu, len=%llu",
+				Vbo, Lbo, ByteCount);
 
 
-	LOG_EXIT_ULONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_add_extent_map_entry */

Modified: trunk/src/file.c
===================================================================
--- trunk/src/file.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/file.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -97,7 +97,7 @@
 	struct buffer_head *fe_bh = NULL;
 	int truncate_pages = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", inode, file, 
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", inode, file, 
                         file->f_dentry->d_name.len, file->f_dentry->d_name.name);
 
 	osb = OCFS_GENERIC_SB_P(inode->i_sb);
@@ -253,7 +253,7 @@
 	LOG_TRACE_ARGS
 	    ("exiting file_open: file=%p dentry=%p inode=%p kiovec=%d\n",
 	     file, file->f_dentry, file->f_dentry->d_inode, err);
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_file_open */
 
@@ -268,7 +268,7 @@
         struct dentry *dentry;
 	bool last_close = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", inode, file,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", inode, file,
                         file->f_dentry->d_name.len, file->f_dentry->d_name.name);
 
 	dentry = file->f_dentry;
@@ -312,7 +312,7 @@
                 goto bail;
         }
 
-        LOG_TRACE_ARGS ("openhandles: %d / osbfiles: %d / refcount: %d\n",
+        LOG_TRACE_ARGS ("openhandles: %d / osbfiles: %lld / refcount: %d\n",
                         OCFS_I(inode)->open_hndl_cnt, osb->file_open_cnt,
                         atomic_read(&dentry->d_count)); 
 
@@ -363,7 +363,7 @@
 bail:
 //	ocfs_bh_sem_hash_cleanup_pid(ocfs_getpid());
 
-	LOG_EXIT_LONG (0);
+	LOG_EXIT_INT (0);
 	return 0;
 }				/* ocfs_file_release */
 
@@ -375,7 +375,7 @@
 {
 	int err = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", file,
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", file,
                         file->f_dentry->d_name.len, file->f_dentry->d_name.name);
 
 	err = ocfs_sync_inode(file->f_dentry->d_inode);
@@ -394,7 +394,7 @@
 	struct inode *inode = dentry->d_inode;
 	ocfs_super *osb = OCFS_GENERIC_SB_P(inode->i_sb);
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", file, dentry, datasync,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", file, dentry, datasync,
                         dentry->d_name.len, dentry->d_name.name);
 
 	err = ocfs_sync_inode(dentry->d_inode);
@@ -438,7 +438,7 @@
 	fileEntry = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
 
 	if (!IS_VALID_FILE_ENTRY(fileEntry)) {
-		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HILO (file_off));
+		LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
 		OCFS_BH_PUT_DATA(bh);
 		status = -EFAIL;
 		goto leave;
@@ -559,8 +559,9 @@
 	struct super_block *sb = inode->i_sb;
 	int needs_trunc = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", filp, buf, count,
-                        filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, '%*s')\n", filp, buf,
+                        (unsigned int)count,
+			filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
 
 	/* happy write of zero bytes */
 	if (count == 0) {
@@ -591,7 +592,7 @@
 	}
 	
 	if (filp->f_flags & O_APPEND) {
-		LOG_TRACE_ARGS("O_APPEND: inode->i_size=%u, ppos was %u\n",
+		LOG_TRACE_ARGS("O_APPEND: inode->i_size=%llu, ppos was %llu\n",
 			       inode->i_size, *ppos);
 		*ppos = inode->i_size;
 	}
@@ -657,22 +658,20 @@
 	if (writingAtEOF)
 		LOG_TRACE_STR ("Writing at EOF");
 
-	LOG_TRACE_ARGS ("ppos=%u.%u newsize=%u.%u cursize=%u.%u\n",
-			HI (*ppos), LO (*ppos), HI (newsize), LO (newsize),
-			HI (inode->i_size), LO (inode->i_size));
+	LOG_TRACE_ARGS ("ppos=%llu newsize=%llu cursize=%llu\n",
+			*ppos, newsize, inode->i_size);
 
 	if (writingAtEOF) {
 		LOG_TRACE_ARGS
-		    ("Will need more allocation: have=%u.%u, need=%u.%u\n",
-		     HI (OCFS_I(inode)->alloc_size), LO (OCFS_I(inode)->alloc_size), HI (newsize),
-		     LO (newsize));
+		    ("Will need more allocation: have=%llu, need=%llu\n",
+		     OCFS_I(inode)->alloc_size, newsize);
 
 		status = ocfs_extend_file (osb, newsize, GET_INODE_FEOFF(inode), NULL, inode, NULL);
 		if (status < 0) {
 			if (status != -EINTR && status != -ENOSPC) {
 				LOG_ERROR_STATUS (status);
-				LOG_ERROR_ARGS ("Failed to extend file from %u.%u to %u.%u",
-			     		HILO (*ppos), HILO (newsize));
+				LOG_ERROR_ARGS ("Failed to extend file from %llu to %llu",
+			     		*ppos, newsize);
 				ret = -ENOSPC;
 			} else
 				ret = status;
@@ -714,7 +713,7 @@
 #endif
 		ocfs_bh_sem_hash_cleanup_pid(ocfs_getpid());
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_file_write */
 
@@ -730,7 +729,8 @@
 	struct inode *inode = filp->f_dentry->d_inode;
 	int status = 0, needs_trunc = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", filp, buf, count,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, '%*s')\n", filp, buf,
+			(unsigned int)count,
                         filp->f_dentry->d_name.len, filp->f_dentry->d_name.name);
 
 
@@ -783,7 +783,7 @@
 		LOG_TRACE_STR ("Generic_file_read returned -EINVAL");
 
 bail:
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_file_read */
 
@@ -807,8 +807,8 @@
 	int flags = 0;
 	ocfs_journal_handle *handle = NULL;
 
-	LOG_ENTRY_ARGS ("(file_off = %u.%u, file_size = %u.%u\n", 
-		   HILO(file_off), HILO(file_size));
+	LOG_ENTRY_ARGS ("(file_off = %llu, file_size = %llu\n", 
+		   file_off, file_size);
 
         new_alloc_size = OCFS_ALIGN(file_size, csize);
 
@@ -827,7 +827,7 @@
 
 	fe = (ocfs_file_entry *)OCFS_BH_GET_DATA_READ(bh); /* read */
 	if (!IS_VALID_FILE_ENTRY(fe)) {
-		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HILO (file_off));
+		LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
 		status = -EFAIL;
 		OCFS_BH_PUT_DATA(bh);
 		goto leave;
@@ -869,9 +869,9 @@
 	 * one. This really ought to check for other things too, like
 	 * a valid bit, etc. */
 	if (file_size > fe->file_size) {
-		LOG_TRACE_ARGS("asked to truncate file with size (%u.%u) "
-			       "to size (%u.%u)!\n", HILO(fe->file_size), 
-			       HILO(file_size));
+		LOG_TRACE_ARGS("asked to truncate file with size (%llu) "
+			       "to size (%llu)!\n", fe->file_size, 
+			       file_size);
 		OCFS_BH_PUT_DATA(bh);
 		up(&OCFS_I(inode)->priv_sem);
 		status = -EINVAL;
@@ -989,7 +989,7 @@
 	if (!IS_VALID_FILE_ENTRY(fileEntry)) {
 		printk("fe->signature=%8s\n", fileEntry->signature);
 		printk("fe->filename=%8s\n", fileEntry->filename);
-		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HILO (file_off));
+		LOG_ERROR_ARGS ("Invalid fe at offset %llu", file_off);
 		status = -EFAIL;
 		OCFS_BH_PUT_DATA(bh);
 		goto leave;
@@ -1130,7 +1130,7 @@
 
 	/* Update tha file size and add the new one to old one. */
 	fileEntry->file_size = file_size;
-	LOG_TRACE_ARGS("fileEntry->alloc_size = %u.%u\n", HILO(fileEntry->alloc_size));
+	LOG_TRACE_ARGS("fileEntry->alloc_size = %llu\n", fileEntry->alloc_size);
 
 	if (attr)
 		OCFS_FE_SET_ATTRIBUTES(fileEntry, attr);
@@ -1214,7 +1214,7 @@
 	bool extended = false;
 	int needs_trunc = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, '%*s')\n", dentry,
+	LOG_ENTRY_ARGS ("(0x%p, '%*s')\n", dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	osb = OCFS_GENERIC_SB_P(inode->i_sb);
@@ -1331,7 +1331,7 @@
 #endif
 		ocfs_bh_sem_hash_cleanup_pid(ocfs_getpid());
 
-	LOG_EXIT_LONG (error);
+	LOG_EXIT_INT (error);
 	return error;
 }				/* ocfs_setattr */
 
@@ -1391,7 +1391,7 @@
 	int status, needs_trunc = 0;
 	ocfs_super *osb;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", dentry, attr,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dentry, attr,
                         dentry->d_name.len, dentry->d_name.name);
 
 	inode = dentry->d_inode;
@@ -1411,7 +1411,7 @@
 		LOG_ERROR_STATUS (status);
 
 bail:
-	LOG_EXIT_LONG (0);
+	LOG_EXIT_INT (0);
 	return 0;
 }				/* ocfs_getattr */
 #endif

Modified: trunk/src/hash.c
===================================================================
--- trunk/src/hash.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/hash.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -52,7 +52,7 @@
 	int status = 0;
 	__u32 tmp;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, lockres);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, lockres);
 
 	if (HASHTABLE_DESTROYED (&(osb->root_sect_node))) {
 		LOG_TRACE_STATUS (status = -EFAIL);
@@ -73,16 +73,17 @@
 
 	if (*found_lockres) {
 		ocfs_get_lockres (*found_lockres);
-		LOG_TRACE_ARGS ("isn: fres=0x%08x, ref=%d, lid=%u.%u\n",
+		LOG_TRACE_ARGS ("isn: fres=0x%p, ref=%d, lid=%llu\n",
 				*found_lockres,
 				atomic_read (&((*found_lockres)->lr_ref_cnt)),
-				HILO((*found_lockres)->sector_num));
+				(*found_lockres)->sector_num);
 	}
 	else {
 		ocfs_get_lockres (lockres);
-		LOG_TRACE_ARGS ("isn: lres=0x%08x, ref=%d, lid=%u.%u\n", lockres,
+		LOG_TRACE_ARGS ("isn: lres=0x%p, ref=%d, lid=%llu\n",
+				lockres,
 				atomic_read (&lockres->lr_ref_cnt),
-				HILO(lockres->sector_num));
+				lockres->sector_num);
 	}	
 
 bail:
@@ -99,8 +100,8 @@
 	int status = 0;
 	__u32 len = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, 0x%08x)\n", osb, HI (lock_id),
-			LO (lock_id), lockres);
+	LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p)\n", osb, lock_id,
+			lockres);
 
 	if (HASHTABLE_DESTROYED (&(osb->root_sect_node))) {
 		status = -EFAIL;
@@ -121,8 +122,8 @@
 		}
 
 		ocfs_get_lockres (*lockres);
-		LOG_TRACE_ARGS ("lsn: lid=%u.%u, lres=0x%08x, ref=%d\n",
-				HILO(lock_id), *lockres,
+		LOG_TRACE_ARGS ("lsn: lid=%llu, lres=0x%p, ref=%d\n",
+				lock_id, *lockres,
 				atomic_read (&((*lockres)->lr_ref_cnt)));
 	} else
 		status = -ENOENT;		
@@ -138,7 +139,7 @@
  */
 void ocfs_remove_sector_node (ocfs_super * osb, ocfs_lock_res * lockres)
 {
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, lockres);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, lockres);
 
 	if (HASHTABLE_DESTROYED (&(osb->root_sect_node))) {
 		LOG_TRACE_STATUS (-EFAIL);
@@ -150,9 +151,9 @@
 		goto bail;
 	}
 
-	LOG_TRACE_ARGS ("rsn: lres=0x%08x, ref=%d, lid=%u.%u\n", lockres,
+	LOG_TRACE_ARGS ("rsn: lres=0x%p, ref=%d, lid=%llu\n", lockres,
 			atomic_read (&lockres->lr_ref_cnt),
-			HILO(lockres->sector_num));
+			lockres->sector_num);
 
 	ocfs_hash_del (&(osb->root_sect_node), &(lockres->sector_num),
 		       sizeof (__u64));
@@ -203,7 +204,7 @@
 	ret = 1;
 
 bail:
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_hash_create */
 
@@ -352,7 +353,7 @@
 	/* Create a new bucket and add to the end of list */
 	if ((bucket = (HASHBUCKET *) ocfs_malloc (sizeof (HASHBUCKET))) == NULL) {
 		LOG_ERROR_ARGS ("unable to allocate %u bytes of memory",
-				sizeof (HASHBUCKET));
+				(unsigned int)sizeof (HASHBUCKET));
 		ret = 0;
 		goto bail;
 	}
@@ -373,7 +374,7 @@
 	if (lockacqrd)
 		up(&(ht->hashlock));
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_hash_add */
 
@@ -444,7 +445,7 @@
 	if (lockacqrd)
 		up (&(ht->hashlock));
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_hash_del */
 
@@ -489,7 +490,7 @@
 	if (lockacqrd)
 		up (&(ht->hashlock));
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_hash_get */
 
@@ -659,7 +660,7 @@
 {
 	if (atomic_dec_and_lock(&sem->s_refcnt, &OcfsGlobalCtxt.bh_sem_hash_lock)) {
 		if (buffer_modified(sem->s_bh)) {
-			LOG_ERROR_ARGS("putting last refcount of a modified buffer!  block %d\n",
+			LOG_ERROR_ARGS("putting last refcount of a modified buffer!  block %lu\n",
 				       sem->s_bh->b_blocknr);
 		}
 		put_bh(sem->s_bh);
@@ -790,7 +791,7 @@
 		//	      sem->s_pid);
 			      
 		if (buffer_modified(sem->s_bh) && sem->s_pid == 0) {
-			LOG_ERROR_ARGS("found a%s sem with a modified bh but no pid!!! (block=%d)\n", 
+			LOG_ERROR_ARGS("found a%s sem with a modified bh but no pid!!! (block=%lu)\n", 
 				       newsem != sem ? "n old" : " new",
 				       sem->s_bh->b_blocknr);
 		}
@@ -1064,7 +1065,7 @@
 			LOG_TRACE_ARGS("missed block %lu, refcount %u, "
 				       "pid = %u\n",
 				       sem->s_blocknr, 
-				       sem->s_refcnt,
+				       atomic_read(&sem->s_refcnt),
 				       sem->s_pid);
 		}
 	}
@@ -1274,11 +1275,11 @@
 			if (atomic_read(&inum->i_inode->i_count) > 1)
 				LOG_ERROR_ARGS("inode (%lu) with i_count = %u "
 					  "left in system, (voteoff = "
-					  "%u.%u, fileoff = %u.%u)\n", 
+					  "%llu, fileoff = %llu)\n", 
 					  inum->i_inode->i_ino,
 					  atomic_read(&inum->i_inode->i_count),
-					  HILO(inum->i_voteoff), 
-					  HILO(inum->i_feoff));
+					  inum->i_voteoff, 
+					  inum->i_feoff);
 
 			iput(inum->i_inode);
 		}
@@ -1389,7 +1390,7 @@
 	ocfs_inode_hash *h = &osb->inode_hash;
 	struct inode * inode = NULL;
 
-//	LOG_ENTRY_ARGS("(voteoff=%u.%u, reverse = %s)\n", HILO(voteoff),
+//	LOG_ENTRY_ARGS("(voteoff=%llu, reverse = %s)\n", voteoff,
 //		       reverse ? "true" : "false");
 
 search:
@@ -1403,8 +1404,8 @@
 	if (inum) {
 		if (inum->i_state == INUM_UNBOUND) {
 			spin_unlock(&h->lock);
-			LOG_TRACE_ARGS("waiting for inum (%lu, %u.%u) to be "
-				       "bound\n", inum->i_ino, HILO(voteoff));
+			LOG_TRACE_ARGS("waiting for inum (%lu, %llu) to be "
+				       "bound\n", inum->i_ino, voteoff);
 
 			yield();
 			goto search;
@@ -1430,8 +1431,8 @@
 		printk("       i_state   = %s\n", (inum->i_state == INUM_BOUND)
 		       ? "INUM_BOUND" : "INUM_UNBOUND");
 		printk("       i_ino     = %lu\n", inum->i_ino);
-		printk("       i_voteoff = %u.%u\n", HILO(inum->i_voteoff));
-		printk("       i_feoff   = %u.%u\n", HILO(inum->i_feoff));
+		printk("       i_voteoff = %llu\n", inum->i_voteoff);
+		printk("       i_feoff   = %llu\n", inum->i_feoff);
 		printk("       i_inode   = 0x%p\n", inum->i_inode);
 	}
 
@@ -1444,8 +1445,8 @@
 	printk("ocfs: inode info\n");
 	printk("       inode     = 0x%p\n", inode);
 	printk("       i_ino     = %lu\n", inode->i_ino);
-	printk("       voteoff   = %u.%u\n", HILO(OCFS_I(inode)->voteoff));
-	printk("       feoff     = %u.%u\n", HILO(OCFS_I(inode)->feoff));
+	printk("       voteoff   = %llu\n", OCFS_I(inode)->voteoff);
+	printk("       feoff     = %llu\n", OCFS_I(inode)->feoff);
 	printk("       i_count   = %u\n", atomic_read(&inode->i_count));
 	printk("       deleted   = %s\n", INODE_DELETED(inode) ? "yes" : "no");
 	return;
@@ -1470,8 +1471,8 @@
 	unsigned long ino = 0;
 	struct super_block *sb = osb->sb;
 
-	LOG_ENTRY_ARGS("(offset = %u.%u, fe_off = %u.%u)\n", 
-		       HILO(offset), HILO(fe_off));
+	LOG_ENTRY_ARGS("(offset = %llu, fe_off = %llu)\n", 
+		       offset, fe_off);
 
 again:
 	spin_lock(&h->lock);
@@ -1480,14 +1481,14 @@
 
 	/* whoa, offset better be the same! */
 	if (inum && (inum->i_voteoff != offset)) {
-		LOG_ERROR_ARGS("inum=%p, i_voteoff=%u.%u, offset=%u.%u)\n",
+		LOG_ERROR_ARGS("inum=%p, i_voteoff=%llu, offset=%llu)\n",
 			       inum, inum ? inum->i_voteoff : 0ULL,
 			       offset);
 		BUG();
 	}
 
 	if (inum && (inum->i_feoff != fe_off)) {
-		LOG_ERROR_ARGS("inum=%p, i_feoff=%u.%u, fe_off=%u.%u)\n",
+		LOG_ERROR_ARGS("inum=%p, i_feoff=%llu, fe_off=%llu)\n",
 			       inum, inum ? inum->i_feoff : 0ULL,
 			       fe_off);
 		BUG();
@@ -1548,26 +1549,26 @@
 	ocfs_inode_hash *h = &osb->inode_hash;
 	ocfs_inode_num *inum = NULL;
 
-	LOG_ENTRY_ARGS("(voteoff=%u.%u, inode->i_ino = %lu)\n",
-		       HILO(voteoff), inode->i_ino);
+	LOG_ENTRY_ARGS("(voteoff=%llu, inode->i_ino = %lu)\n",
+		       voteoff, inode->i_ino);
 
 	spin_lock(&h->lock);
 
 	inum = __ocfs_inode_hash_lookup(h, voteoff);
 
 	if (!inum) {
-		printk("ocfs2: lost inum (voteoff = %u.%u)! AIEEEE!\n", 
-		       HILO(voteoff));
+		printk("ocfs2: lost inum (voteoff = %llu)! AIEEEE!\n", 
+		       voteoff);
 		ocfs_debug_print_inum(inum, inode);
 		BUG();
 	}
 
 	if ((inum->i_voteoff != voteoff) 
 	    || (GET_INODE_VOTEOFF(inode) != voteoff)) {
-		LOG_ERROR_ARGS("passed=%u.%u, on inode=%u.%u, "
-			       "(inum voteoff = %u.%u, feoff = %u.%u)\n",
-			       HILO(voteoff), HILO(GET_INODE_VOTEOFF(inode)),
-			       HILO(inum->i_voteoff), HILO(inum->i_feoff));
+		LOG_ERROR_ARGS("passed=%llu, on inode=%llu, "
+			       "(inum voteoff = %llu, feoff = %llu)\n",
+			       voteoff, GET_INODE_VOTEOFF(inode),
+			       inum->i_voteoff, inum->i_feoff);
 		BUG();
 	}
 
@@ -1575,10 +1576,10 @@
 		LOG_ERROR_ARGS("inode numbers don't match! "
 			       "(inum=%lu, inode=%lu)\n", 
 			       inum->i_ino, inode->i_ino);
-		LOG_ERROR_ARGS("passed=%u.%u, on inode=%u.%u, "
-			       "(inum voteoff = %u.%u, feoff = %u.%u)\n",
-			       HILO(voteoff), HILO(GET_INODE_VOTEOFF(inode)),
-			       HILO(inum->i_voteoff), HILO(inum->i_feoff));
+		LOG_ERROR_ARGS("passed=%llu, on inode=%llu, "
+			       "(inum voteoff = %llu, feoff = %llu)\n",
+			       voteoff, GET_INODE_VOTEOFF(inode),
+			       inum->i_voteoff, inum->i_feoff);
 		BUG();
 	}
 
@@ -1588,13 +1589,13 @@
 		if (ocfs_inc_icount(inode) < 0)
 			BUG();
 
-		LOG_TRACE_ARGS("bound to ino %lu, voteoff=%u.%u, "
-			       "feoff=%u.%u\n", inode->i_ino, 
-			       HILO(inum->i_voteoff), HILO(inum->i_feoff));
+		LOG_TRACE_ARGS("bound to ino %lu, voteoff=%llu, "
+			       "feoff=%llu\n", inode->i_ino, 
+			       inum->i_voteoff, inum->i_feoff);
 	} else if (inum->i_inode != inode) {
 		LOG_ERROR_ARGS("Inum is bound to a different inode! "
-			       "(%u.%u) (%lu) (%lu) (deleted = %u)\n",
-			       HILO(voteoff), inode->i_ino, 
+			       "(%llu) (%lu) (%lu) (deleted = %u)\n",
+			       voteoff, inode->i_ino, 
 			       inum->i_inode->i_ino, 
 			       INODE_DELETED(inum->i_inode));
 		ocfs_debug_print_inum(inum, inode);
@@ -1621,7 +1622,7 @@
 
 	if (inum == NULL) {
 		printk("ocfs2: Cannot remove a nonexistent inum from hash!"
-		       "(%u.%u)\n", HILO(off));
+		       "(%llu)\n", off);
 		BUG();
 	}
 
@@ -1638,7 +1639,7 @@
 {
 	ocfs_inode_num *inum = NULL;
 
-	LOG_ENTRY_ARGS("(off = %u.%u)\n", HILO(off));
+	LOG_ENTRY_ARGS("(off = %llu)\n", off);
 
 	spin_lock(&h->lock);
 
@@ -1648,9 +1649,9 @@
 
 	if (!inum->i_inode || inum->i_state == INUM_UNBOUND)
 		LOG_ERROR_ARGS("deleting inum in unbound state! (state = %d, "
-			       "voteoff = %u.%u, feoff = %u.%u, i_ino = %u\n",
-			       inum->i_state, HILO(inum->i_voteoff),
-			       HILO(inum->i_feoff), inum->i_ino);
+			       "voteoff = %llu, feoff = %llu, i_ino = %lu\n",
+			       inum->i_state, inum->i_voteoff,
+			       inum->i_feoff, inum->i_ino);
 
 	if (inum->i_inode)
 		iput(inum->i_inode);
@@ -1681,9 +1682,9 @@
 	struct list_head *head;
 	int bucket;
 
-	LOG_ENTRY_ARGS("(oldoff = %u.%u, newoff = %u.%u, "
-		       "new_fe_off = %u.%u)\n", 
-		       HILO(oldoff), HILO(newoff), HILO(new_fe_off));
+	LOG_ENTRY_ARGS("(oldoff = %llu, newoff = %llu, "
+		       "new_fe_off = %llu)\n", 
+		       oldoff, newoff, new_fe_off);
 
 	spin_lock(&h->lock);
 
@@ -1693,9 +1694,8 @@
 		target = __ocfs_inode_hash_lookup(h, newoff);
 		if (target) {
 			LOG_ERROR_ARGS("Rehashing on top of an existing inum!"
-				       "oldoff = %u.%u, newoff = %u.%u\n", 
-				       HILO(oldoff),
-				       HILO(newoff));
+				       "oldoff = %llu, newoff = %llu\n", 
+				       oldoff, newoff);
 			BUG();
 		}
 	}

Modified: trunk/src/heartbeat.c
===================================================================
--- trunk/src/heartbeat.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/heartbeat.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -56,7 +56,7 @@
 	struct buffer_head **pub_bh = &osb->cfg_bhs[publish_idx];
 	__u64 node_publ_off = osb->vol_layout.publ_sect_off + (osb->node_num * osb->sect_size);
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, %s)\n", osb, flag,
+	LOG_ENTRY_ARGS ("(0x%p, %u, %s)\n", osb, flag,
 			read_publish ? "true" : "false");
 
 	if (flag & HEARTBEAT_METHOD_DISK) {
@@ -124,7 +124,7 @@
 	__u32 i;
 	__u32 num_nodes;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u)\n", osb, bhs, first_time);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u)\n", osb, bhs, first_time);
 
 	num_nodes = OCFS_MAXIMUM_NODES;
 	node_map = &(osb->vol_node_map);

Modified: trunk/src/inc/io.h
===================================================================
--- trunk/src/inc/io.h	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/inc/io.h	2004-05-04 22:25:00 UTC (rev 889)
@@ -272,11 +272,11 @@
 	if (bh) {							      \
 		ocfs_file_entry *__fe = (ocfs_file_entry *) bh->b_data;	      \
 		if (IS_VALID_FILE_ENTRY(__fe)) {			      \
-			printk("ocfs2: %s:%d fe_check: file_size = (%u.%u), " \
-				"this_sector = (%u.%u)\n",		      \
+			printk("ocfs2: %s:%d fe_check: file_size = (%llu), " \
+				"this_sector = (%llu)\n",		      \
 				__FUNCTION__, __LINE__, 		      \
-				HILO(__fe->file_size),			      \
-				HILO(__fe->this_sector));		      \
+				__fe->file_size,			      \
+				__fe->this_sector);		      \
 		}							      \
 	}								      \
 } while(0)
@@ -318,13 +318,13 @@
 				BUG();
 			} else if (bh->b_blocknr != 4720) {
 				OCFS_DO_HEX_DUMP(bh);
-				printk("uh oh!  dirnode is being written at blocknr=%u!\n", bh->b_blocknr);
+				printk("uh oh!  dirnode is being written at blocknr=%lu!\n", bh->b_blocknr);
 				BUG();
 			}
 		} else if (strncmp("FIL", fe->signature, strlen("FIL"))==0) {
 			if (fe->this_sector >> 9 != bh->b_blocknr) {
 				OCFS_DO_HEX_DUMP(bh);
-				printk("uh oh!  fe->this_sector (%u) != blocknr (%u)\n",
+				printk("uh oh!  fe->this_sector (%u) != blocknr (%lu)\n",
 				       (__u32)(fe->this_sector>>9), bh->b_blocknr);
 				BUG();
 			} else if (fe->extents[0].disk_off >> 9 == 4720) {

Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/inc/ocfs.h	2004-05-04 22:25:00 UTC (rev 889)
@@ -1054,10 +1054,7 @@
 extern __u32 debug_level;
 extern __u32 debug_exclude;
 
-#define HI(val)            ((unsigned long)(((val) >> 16) >> 16))
-#define LO(val)            ((unsigned long)((val) & 0x00000000FFFFFFFFUL))
 
-#define HILO(val)          HI(val), LO(val)
 
 /* Tracing Levels */
 #define OCFS_DEBUG_LEVEL_ERROR         0x00000001
@@ -1113,9 +1110,9 @@
 	do {								      \
 		rdtsc (end.lohi[0], end.lohi[1]);			      \
 		IF_LEVEL_NO_CONTEXT(OCFS_DEBUG_LEVEL_TIMING)		      \
-			printk("(%d) EXIT : %s() = %d  => [%u.%u]\n",	      \
+			printk("(%d) EXIT : %s() = %d  => [%llu]\n",	      \
 				ocfs_getpid(), _fn, _ret,		      \
-				HILO(end.q-begin.q));			      \
+				end.q-begin.q);			      \
 	} while(0)		      
 #else
 #define IO_FUNC_TIMING_DECL
@@ -1173,8 +1170,7 @@
 				_b = hi; _b <<= 32; _b |= lo;	\
 				_e = _hi; _e <<= 32; _e |= _lo;	\
 				_e -= _b; 			\
-				sprintf((s), " => [%u.%u]",	\
-					HI(_e), LO(_e));	\
+				sprintf((s), " => [%llu]", _e);	\
 			}					\
 		}						\
 	} while (0)
@@ -1197,6 +1193,11 @@
         return;
 }
 
+static inline void eat_value_uint(unsigned int val)
+{
+        return;
+}
+
 static inline void eat_value_long(long val)
 {
         return;
@@ -1217,6 +1218,8 @@
 # define  LOG_ENTRY()
 # define  LOG_EXIT()
 # define  LOG_EXIT_STATUS(val)                  eat_value_int(val)
+# define  LOG_EXIT_INT(val)                    eat_value_int(val)
+# define  LOG_EXIT_UINT(val)                   eat_value_uint(val)
 # define  LOG_EXIT_LONG(val)                    eat_value_long(val)
 # define  LOG_EXIT_ULONG(val)                   eat_value_ulong(val)
 # define  LOG_EXIT_PTR(val)                     eat_value_ptr(val)
@@ -1259,14 +1262,11 @@
 		GET_TIMING(NULL, _HI, _LO);				\
 		IF_LEVEL(OCFS_DEBUG_LEVEL_ENTRY) {			\
 			PRINT_ENTRY(_t);				\
-			if (fmt==NULL)					\
-				printk("() \n");			\
-			else						\
-				printk(fmt, ##arg);			\
+			printk(fmt, ##arg);			\
 		}							\
 	} while (0)
 
-#define LOG_ENTRY()            LOG_ENTRY_ARGS(NULL)
+#define LOG_ENTRY()            LOG_ENTRY_ARGS("() \n")
 
 
 
@@ -1282,18 +1282,20 @@
 			GET_TIMING(_t, _HI, _LO);			\
 			printk("(%d) EXIT : %s() %s", 			\
 			       ocfs_getpid (), __FUNCTION__, 		\
-			       (fmt==NULL ? "" : "= "));		\
-			if (fmt!=NULL)					\
+			       (*fmt == '\n' ? "" : "= "));		\
+			if (*fmt != '\n')					\
 				printk(fmt, ## arg);			\
 			PRINT_STRING(_t);				\
 		}							\
 	}  while (0)
 
-#define LOG_EXIT()             LOG_EXIT_ARGS(NULL)
+#define LOG_EXIT()             LOG_EXIT_ARGS("\n") /* I hate you Sunil */
 #define LOG_EXIT_STATUS(val)   LOG_EXIT_ARGS("%d ", val)
-#define LOG_EXIT_LONG(val)     LOG_EXIT_ARGS("%d ", val)
-#define LOG_EXIT_ULONG(val)    LOG_EXIT_ARGS("%u ", val)
-#define LOG_EXIT_PTR(val)      LOG_EXIT_ARGS("0x%08x ", val)
+#define LOG_EXIT_INT(val)      LOG_EXIT_ARGS("%d ", val)
+#define LOG_EXIT_UINT(val)     LOG_EXIT_ARGS("%u ", val)
+#define LOG_EXIT_LONG(val)     LOG_EXIT_ARGS("%ld ", val)
+#define LOG_EXIT_ULONG(val)    LOG_EXIT_ARGS("%lu ", val)
+#define LOG_EXIT_PTR(val)      LOG_EXIT_ARGS("0x%p ", val)
 
 
 /* TRACE macros */
@@ -1324,13 +1326,12 @@
  */
 #define LOG_ERROR_ARGS(fmt, arg...)					\
 	do {								\
-		printk(KERN_ERR "(%d) ERROR: ", ocfs_getpid ());        \
+		printk(KERN_ERR "(%d) ERROR at %s, %d: ", ocfs_getpid (), __FILE__, __LINE__);        \
 		printk(fmt, ## arg);					\
-		printk(", %s, %d\n", __FILE__, __LINE__);		\
 	} while (0)
 
-#define LOG_ERROR_STR(str)     LOG_ERROR_ARGS("%s", str)
-#define LOG_ERROR_STATUS(st)   LOG_ERROR_ARGS("status = %d", st)
+#define LOG_ERROR_STR(str)     LOG_ERROR_ARGS("%s\n", str)
+#define LOG_ERROR_STATUS(st)   LOG_ERROR_ARGS("status = %d\n", st)
 
 #define  LOG_TYPE_DISK_ALLOC      1
 #define  LOG_TYPE_RECOVERY        3
@@ -2500,16 +2501,16 @@
 	}
 
 	if (dentry)
-		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%d, i_ino=%d, name='%*s'\n",
-			       inode->i_count, inode->i_state, inode->i_ino,
+		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%lu, i_ino=%lu, name='%*s'\n",
+			       atomic_read(&inode->i_count), inode->i_state, inode->i_ino,
 			       dentry->d_name.len, dentry->d_name.name);
 	else
-		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%d, i_ino=%d, no dentry\n",
-			       inode->i_count, inode->i_state, inode->i_ino);
+		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%lu, i_ino=%lu, no dentry\n",
+			       atomic_read(&inode->i_count), inode->i_state, inode->i_ino);
 
-	LOG_ERROR_ARGS("voteoff=%u.%u, feoff=%u.%u, deleted=%u\n", 
-		       HILO(GET_INODE_VOTEOFF(inode)), 
-		       HILO(GET_INODE_FEOFF(inode)),
+	LOG_ERROR_ARGS("voteoff=%llu, feoff=%llu, deleted=%u\n", 
+		       GET_INODE_VOTEOFF(inode), 
+		       GET_INODE_FEOFF(inode),
 		       INODE_DELETED(inode));
 	return -EINVAL;
 }
@@ -2553,16 +2554,16 @@
 	LOG_ERROR_ARGS("max_cnt = %d, line = %u, root=%u\n", max_cnt, line, 
 		       is_root);
 	if (dentry)
-		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%d, i_ino=%d, name='%*s'\n",
-			       inode->i_count, inode->i_state, inode->i_ino,
+		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%lu, i_ino=%lu, name='%*s'\n",
+			       atomic_read(&inode->i_count), inode->i_state, inode->i_ino,
 			       dentry->d_name.len, dentry->d_name.name);
 	else
-		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%d, i_ino=%d, no dentry\n",
-			       inode->i_count, inode->i_state, inode->i_ino);
+		LOG_ERROR_ARGS("eek! i_count=%d, i_state=%lu, i_ino=%lu, no dentry\n",
+			       atomic_read(&inode->i_count), inode->i_state, inode->i_ino);
 
-	LOG_ERROR_ARGS("voteoff=%u.%u, feoff=%u.%u, deleted=%u\n", 
-		       HILO(GET_INODE_VOTEOFF(inode)), 
-		       HILO(GET_INODE_FEOFF(inode)),
+	LOG_ERROR_ARGS("voteoff=%llu, feoff=%llu, deleted=%u\n", 
+		       GET_INODE_VOTEOFF(inode), 
+		       GET_INODE_FEOFF(inode),
 		       INODE_DELETED(inode));
 
 	BUG();

Modified: trunk/src/inode.c
===================================================================
--- trunk/src/inode.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/inode.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -148,14 +148,14 @@
 	ocfs_find_inode_args args;
 	__u32 flags = 0;
 
-	LOG_ENTRY_ARGS("(voteoff = %u.%u, feoff = %u.%u, fe_bh = %p)\n", 
-		       HILO(voteoff), HILO(feoff), fe_bh);
+	LOG_ENTRY_ARGS("(voteoff = %llu, feoff = %llu, fe_bh = %p)\n", 
+		       voteoff, feoff, fe_bh);
 
 	/* Shortcut: if they ask for the root dirnode, just return
 	 * it. */
 	if (voteoff == osb->vol_layout.root_start_off) {
-		LOG_TRACE_ARGS("Asked for root dirnode (%u.%u)\n",
-			       HILO(feoff));
+		LOG_TRACE_ARGS("Asked for root dirnode (%llu)\n",
+			       feoff);
 
 		inode = osb->sb->s_root->d_inode;
 
@@ -172,7 +172,7 @@
 	/* This shouldn't happen anymore. */
 	if (osb->vol_layout.root_start_off == 0) {
 		LOG_ERROR_ARGS("root_start_off = 0! Skipping inode create for "
-		       "%u.%u, %u.%u\n", HILO(voteoff), HILO(feoff));
+		       "%llu, %llu\n", voteoff, feoff);
 		goto bail;
 	}
 
@@ -298,7 +298,7 @@
 	int ret = 0;
 	ocfs_file_entry *fe = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, 0x%08x)\n", inode, ino, opaque);
+	LOG_ENTRY_ARGS ("(0x%p, %lu, 0x%p)\n", inode, ino, opaque);
 	
 	/* We have unique inode numbers so these are just sanity
 	 * checks at this point. */
@@ -320,7 +320,7 @@
 bail:
 	if (fe)
 		OCFS_BH_PUT_DATA(args->fe_bh);
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_find_inode */
 #endif /* LINUX_VERSION_CODE < LinuxVersionCode(2,5,0) */
@@ -373,7 +373,7 @@
 	__u64 offset, fe_off;
 	unsigned long uniq_ino;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u, size:%u)\n", inode, mode, fe->file_size);
+	LOG_ENTRY_ARGS ("(0x%p, %u, size:%llu)\n", inode, mode, fe->file_size);
 
 	sb = inode->i_sb;
 	osb = OCFS_GENERIC_SB_P(sb);
@@ -421,8 +421,8 @@
 		inode->i_ino = uniq_ino;
 		/* caller needs to know to call inode_hash_bind! */
 	}
-	LOG_TRACE_ARGS("offset = %u.%u, ino = %lu, create_ino = %s\n",
-		       HILO(offset), inode->i_ino, 
+	LOG_TRACE_ARGS("offset = %llu, ino = %lu, create_ino = %s\n",
+		       offset, inode->i_ino, 
 		       create_ino ? "true" : "false");
 
 	switch (inode->i_mode & S_IFMT) {
@@ -509,8 +509,8 @@
 	if (voteoff != OCFS_BITMAP_LOCK_OFFSET 
 	    && voteoff != osb->vol_layout.root_start_off) {
 		printk("ocfs2: yowzah! Asked to create an inode for offset"
-		       "%u.%u, but I haven't yet learned what to do!\n", 
-		       HILO(voteoff));
+		       "%llu, but I haven't yet learned what to do!\n", 
+		       voteoff);
 
 		BUG();
 	}
@@ -591,7 +591,7 @@
 	struct buffer_head *bh = NULL;
 	int status;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", inode, args);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", inode, args);
 
 	if (inode == NULL || inode->i_sb == NULL) {
 		LOG_ERROR_STR ("bad inode");
@@ -774,8 +774,8 @@
 {
 	ocfs_super *osb;
 
-	LOG_ENTRY_ARGS ("(0x%08x, inode_i_ino=%lu)\n", inode, inode->i_ino);
-	LOG_TRACE_ARGS ("put_inode: count=%d\n", inode->i_count);
+	LOG_ENTRY_ARGS ("(0x%p, inode_i_ino=%lu)\n", inode, inode->i_ino);
+	LOG_TRACE_ARGS ("put_inode: count=%d\n", atomic_read(&inode->i_count));
 	osb = OCFS_GENERIC_SB_P(inode->i_sb);
 
 	/* Ok, if after this iput we would be the last holder of the
@@ -823,10 +823,10 @@
 	if (!inode)
 		goto bail;
 
-	LOG_TRACE_ARGS("Clearing inode %u (voteoff: %u.%u, "
-		       "feoff: %u.%u)\n", inode->i_ino, 
-		       HILO(GET_INODE_VOTEOFF(inode)), 
-		       HILO(GET_INODE_FEOFF(inode)));
+	LOG_TRACE_ARGS("Clearing inode %lu (voteoff: %llu, "
+		       "feoff: %llu)\n", inode->i_ino, 
+		       GET_INODE_VOTEOFF(inode), 
+		       GET_INODE_FEOFF(inode));
 
 	/* we should not really be using osb in this context. */
 	osb = OCFS_GENERIC_SB_P(inode->i_sb);
@@ -907,11 +907,11 @@
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u)\n", file, page, from, to);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
 
 	ret = block_prepare_write (page, from, to, ocfs_get_block);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_prepare_write */
 
@@ -923,11 +923,11 @@
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %u)\n", file, page, from, to);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %u)\n", file, page, from, to);
 
 	ret = generic_commit_write (file, page, from, to);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_commit_write */
 
@@ -988,7 +988,7 @@
 	__u64 entryOffset;
 	struct buffer_head *bh = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d, 0x%08x, %d)\n", inode, iblock, bh_result,
+	LOG_ENTRY_ARGS ("(0x%p, %ld, 0x%p, %d)\n", inode, iblock, bh_result,
 			create);
 
 	if (!inode) {
@@ -999,7 +999,7 @@
 	osb = OCFS_GENERIC_SB_P(inode->i_sb);
 
 	if ((iblock << 9) > PATH_MAX + 1) {
-		LOG_ERROR_ARGS ("file offset > PATH_MAX: %u.%u", iblock << 9);
+		LOG_ERROR_ARGS ("file offset > PATH_MAX: %lu", iblock << 9);
 		goto bail;
 	}
 
@@ -1014,14 +1014,14 @@
 
 	if (!IS_VALID_FILE_ENTRY (fe)) {
 		OCFS_BH_PUT_DATA(bh);
-		LOG_ERROR_ARGS ("Invalid fe at offset %u.%u", HILO(entryOffset));
+		LOG_ERROR_ARGS ("Invalid fe at offset %llu", entryOffset);
 		goto bail;
 	}
 
 	if ((iblock << 9) >= (__s64)fe->alloc_size) {
 		OCFS_BH_PUT_DATA(bh);
-		LOG_ERROR_ARGS ("file offset is outside the allocated size: %u.%u",
-		     HILO(iblock << 9));
+		LOG_ERROR_ARGS ("file offset is outside the allocated size: %lu",
+		     iblock << 9);
 		goto bail;
 	}
 
@@ -1034,7 +1034,7 @@
 	if (bh)
 		brelse(bh);
 
-	LOG_EXIT_LONG (err);
+	LOG_EXIT_INT (err);
 	return err;
 }				/* ocfs_symlink_get_block */
 
@@ -1051,7 +1051,7 @@
 	__u32 len;
 	bool oin_locked = false;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d, 0x%08x, %d)\n", inode, iblock, bh_result,
+	LOG_ENTRY_ARGS ("(0x%p, %ld, 0x%p, %d)\n", inode, iblock, bh_result,
 			create);
 
 	if (S_ISLNK (inode->i_mode)) {
@@ -1087,8 +1087,7 @@
 	err = ocfs_lookup_file_allocation(osb, vbo, &lbo, len, NULL, inode);
 	up(&OCFS_I(inode)->inode_extend_sem);
 	if (err < 0) {
-		LOG_ERROR_ARGS ("vbo=%u.%u lbo=%u.%u len=%u", HILO(vbo),
-				HILO(lbo), len);
+		LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u", vbo, lbo, len);
 		goto bail;
 	}
 
@@ -1098,9 +1097,9 @@
 
 	if (bh_result->b_blocknr == 0) {
 		err = -EIO;
-		LOG_ERROR_ARGS ("vbo=%u.%u lbo=%u.%u len=%u, feoff=(%u.%u)\n",
-				HILO(vbo), HILO(lbo), len, 
-				HILO(GET_INODE_FEOFF(inode)));
+		LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u, feoff=(%llu)\n",
+				vbo, lbo, len, 
+				GET_INODE_FEOFF(inode));
 	}
 
 bail:
@@ -1111,7 +1110,7 @@
 		up(&(OCFS_I(inode)->priv_sem));
 	}
 
-	LOG_EXIT_LONG (err);
+	LOG_EXIT_INT (err);
 	return err;
 }				/* ocfs_get_block */
 
@@ -1149,8 +1148,8 @@
 	len = 1;
 	err = ocfs_lookup_file_allocation(osb, vbo, &lbo, len, NULL, inode);
 	if (err < 0) {
-		LOG_ERROR_ARGS ("vbo=%u.%u lbo=%u.%u len=%u", HILO(vbo),
-				HILO(lbo), len);
+		LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u", vbo,
+				lbo, len);
 		LOG_ERROR_STATUS(err);
 		goto bail;
 	}
@@ -1174,7 +1173,7 @@
 	__s64 vbo = 0;
 	__s64 lbo = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %d)\n", inode, iblock);
+	LOG_ENTRY_ARGS ("(0x%p, %ld)\n", inode, iblock);
 
 	if (!inode) {
 		LOG_ERROR_STR ("bad inode");
@@ -1198,15 +1197,15 @@
 	*oblock = lbo >> inode->i_sb->s_blocksize_bits;
 	if (*oblock == 0) {
 		err = -EIO;
-		LOG_ERROR_ARGS ("vbo=%u.%u lbo=%u.%u len=%u, feoff=(%u.%u)\n",
-				HILO(vbo), HILO(lbo), len, 
-				HILO(GET_INODE_FEOFF(inode)));
+		LOG_ERROR_ARGS ("vbo=%lld lbo=%lld len=%u, feoff=(%llu)\n",
+				vbo, lbo, len, 
+				GET_INODE_FEOFF(inode));
 	}
 
 bail:
 	if (err < 0)
 		err = -EIO;
-	LOG_EXIT_LONG (err);
+	LOG_EXIT_INT (err);
 	return err;
 }				/* ocfs_get_block2 */
 #endif
@@ -1219,11 +1218,11 @@
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u)\n", file, (page ? page->index : 0));
+	LOG_ENTRY_ARGS ("(0x%p, %lu)\n", file, (page ? page->index : 0));
 
 	ret = block_read_full_page (page, ocfs_get_block);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_readpage */
 
@@ -1248,11 +1247,11 @@
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x)\n", page);
+	LOG_ENTRY_ARGS ("(0x%p)\n", page);
 
 	ret = block_write_full_page (page, ocfs_get_block);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_writepage */
 #endif

Modified: trunk/src/io.c
===================================================================
--- trunk/src/io.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/io.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -47,7 +47,7 @@
 				struct inode *i = arr[idx];
 				if (i->i_state == I_CLEAR ||
 				    atomic_read(&i->i_count)==0) {
-					LOG_ERROR_ARGS("about to iput inode (%d,%d,%s) one too many times!\n",
+					LOG_ERROR_ARGS("about to iput inode (%lu,%d,%s) one too many times!\n",
 						       i->i_ino, atomic_read(&i->i_count), 
 						       i->i_state == I_CLEAR ? "clear" : "not clear");
 					BUG();
@@ -197,7 +197,7 @@
 	my_timing_t begin, end; 
 #endif
 	
-	LOG_ENTRY_ARGS("(bh[0]->b_blocknr = %u, nr=%d, flags=%u, inodes=%p)\n", 
+	LOG_ENTRY_ARGS("(bh[0]->b_blocknr = %lu, nr=%d, flags=%u, inodes=%p)\n", 
 		       bhs[0]->b_blocknr, nr, flags, inodes);
 #ifdef OCFS_DBG_TIMING
 	rdtsc (begin.lohi[0], begin.lohi[1]);
@@ -267,7 +267,7 @@
 		if (!(flags & OCFS_BH_IGNORE_JBD) && buffer_jbd(bh)) {
 #ifdef VERBOSE_BH_JBD_TRACE
 			LOG_TRACE_ARGS("trying to write a jbd managed bh "
-				       "(blocknr = %u), nr=%d\n", 
+				       "(blocknr = %lu), nr=%d\n", 
 				       bh->b_blocknr, nr);
 #endif
 			continue;
@@ -335,14 +335,14 @@
 #ifdef OCFS_DBG_TIMING
 	my_timing_t begin, end; 
 #endif
-	LOG_ENTRY_ARGS("(off=(%u.%u), len=(%u.%u), flags=%d, inodes=%p)\n", HILO(off), 
-		       HILO(len), flags, inodes);
+	LOG_ENTRY_ARGS("(off=(%llu), len=(%llu), flags=%d, inodes=%p)\n", off, 
+		       len, flags, inodes);
 #ifdef OCFS_DBG_TIMING
 	rdtsc (begin.lohi[0], begin.lohi[1]);
 #endif
 
 	if (len % 512) {
-		LOG_TRACE_ARGS("len %% 512 (len=%u)\n", len);
+		LOG_TRACE_ARGS("len %% 512 (len=%llu)\n", len);
 		status = -EINVAL;
 		LOG_ERROR_STATUS(status);
 		goto bail;
@@ -374,9 +374,9 @@
 	nr = (len + 511) >> 9;
 	if (nr == 0) {
 		LOG_TRACE_STR("No buffers will be read!!!");
-		LOG_TRACE_ARGS("Len=%u Off=%u.%u numbuffers=%u "
-			       "blocknum=%u.%u\n", len, HI (off), LO (off), 
-			       nr, HI (blocknum), LO (blocknum));
+		LOG_TRACE_ARGS("Len=%llu Off=%llu numbuffers=%u "
+			       "blocknum=%llu\n", len, off, 
+			       nr, blocknum);
 		status = 0;
 		goto bail;
 	}
@@ -401,7 +401,7 @@
 			ignore_cache = 1;
 		} else if (flags & OCFS_BH_CACHED && !TEST_BH_SEQNUM(inodes[i], bh)) {
 #ifdef VERBOSE_BH_SEQNUM_TRACE
-			LOG_TRACE_ARGS("(read) bh (%u) seqnum (%u) does not "
+			LOG_TRACE_ARGS("(read) bh (%lu) seqnum (%lu) does not "
 			       	"match inode (%u)\n", bh->b_blocknr, 
 			       	(bh->b_state & STATE_BIT_MASK) >> 19,
 			       	atomic_read(GET_INODE_CLEAN_SEQ(inodes[i])));
@@ -416,7 +416,7 @@
 #ifdef VERBOSE_BH_JBD_TRACE
 			if (!(flags & OCFS_BH_CACHED) || ignore_cache)
 				LOG_TRACE_ARGS("trying to sync read a jbd "
-					       "managed bh (blocknr = %u)\n",
+					       "managed bh (blocknr = %lu)\n",
 					       bh->b_blocknr);
 #endif
 			continue;
@@ -427,7 +427,7 @@
 				/* This should probably be a BUG, or
 				 * at least return an error. */
 				LOG_TRACE_ARGS("asking me to sync read a "
-					      "dirty buffer! (blocknr = %u)\n",
+					      "dirty buffer! (blocknr = %lu)\n",
 					      bh->b_blocknr);
 				continue;
 			}
@@ -454,7 +454,7 @@
 
 		OCFS_BH_PUT_DATA(bh);
 	}
-	LOG_TRACE_ARGS("off=(%u.%u), len=(%u.%u), cached=%s\n", HILO(off), HILO(len), 
+	LOG_TRACE_ARGS("off=(%llu), len=(%llu), cached=%s\n", off, len, 
 		       (!(flags & OCFS_BH_CACHED) || ignore_cache) ? "no" : "yes");
 
 bail:
@@ -480,7 +480,7 @@
 	my_timing_t begin, end; 
 #endif
 	
-	LOG_ENTRY_ARGS("(bh[0]->b_blocknr = %u, nr=%d, flags=%u, inode=%p)\n", 
+	LOG_ENTRY_ARGS("(bh[0]->b_blocknr = %lu, nr=%d, flags=%u, inode=%p)\n", 
 		       bhs[0]->b_blocknr, nr, flags, inode);
 #ifdef OCFS_DBG_TIMING
 	rdtsc (begin.lohi[0], begin.lohi[1]);
@@ -550,7 +550,7 @@
 		if (!(flags & OCFS_BH_IGNORE_JBD) && buffer_jbd(bh)) {
 #ifdef VERBOSE_BH_JBD_TRACE
 			LOG_TRACE_ARGS("trying to write a jbd managed bh "
-				       "(blocknr = %u), nr=%d\n", 
+				       "(blocknr = %lu), nr=%d\n", 
 				       bh->b_blocknr, nr);
 #endif
 			continue;
@@ -619,14 +619,14 @@
 #ifdef OCFS_DBG_TIMING
 	my_timing_t begin, end; 
 #endif
-	LOG_ENTRY_ARGS("(off=(%u.%u), len=(%u.%u), flags=%d, inode=%p)\n", HILO(off), 
-		       HILO(len), flags, inode);
+	LOG_ENTRY_ARGS("(off=(%llu), len=(%llu), flags=%d, inode=%p)\n", off, 
+		       len, flags, inode);
 #ifdef OCFS_DBG_TIMING
 	rdtsc (begin.lohi[0], begin.lohi[1]);
 #endif
 
 	if (len % 512) {
-		LOG_TRACE_ARGS("len %% 512 (len=%u)\n", len);
+		LOG_TRACE_ARGS("len %% 512 (len=%llu)\n", len);
 		status = -EINVAL;
 		LOG_ERROR_STATUS(status);
 		goto bail;
@@ -658,9 +658,9 @@
 	nr = (len + 511) >> 9;
 	if (nr == 0) {
 		LOG_TRACE_STR("No buffers will be read!!!");
-		LOG_TRACE_ARGS("Len=%u Off=%u.%u numbuffers=%u "
-			       "blocknum=%u.%u\n", len, HI (off), LO (off), 
-			       nr, HI (blocknum), LO (blocknum));
+		LOG_TRACE_ARGS("Len=%llu Off=%llu numbuffers=%u "
+			       "blocknum=%llu\n", len, off, 
+			       nr, blocknum);
 		status = 0;
 		goto bail;
 	}
@@ -684,7 +684,7 @@
 		if (flags & OCFS_BH_CACHED && inode && 
 		    !TEST_BH_SEQNUM(inode, bh)) {
 #ifdef VERBOSE_BH_SEQNUM_TRACE
-			LOG_TRACE_ARGS("(read) bh (%u) seqnum (%u) does not "
+			LOG_TRACE_ARGS("(read) bh (%lu) seqnum (%lu) does not "
 				       "match inode (%u)\n", bh->b_blocknr, 
 				       (bh->b_state & STATE_BIT_MASK) >> 19,
 				       atomic_read(GET_INODE_CLEAN_SEQ(inode)));
@@ -699,7 +699,7 @@
 #ifdef VERBOSE_BH_JBD_TRACE
 			if (!(flags & OCFS_BH_CACHED) || ignore_cache)
 				LOG_TRACE_ARGS("trying to sync read a jbd "
-					       "managed bh (blocknr = %u)\n",
+					       "managed bh (blocknr = %lu)\n",
 					       bh->b_blocknr);
 #endif
 			continue;
@@ -710,7 +710,7 @@
 				/* This should probably be a BUG, or
 				 * at least return an error. */
 				LOG_TRACE_ARGS("asking me to sync read a "
-					      "dirty buffer! (blocknr = %u)\n",
+					      "dirty buffer! (blocknr = %lu)\n",
 					      bh->b_blocknr);
 				continue;
 			}
@@ -737,7 +737,7 @@
 
 		OCFS_BH_PUT_DATA(bh);
 	}
-	LOG_TRACE_ARGS("off=(%u.%u), len=(%u.%u), cached=%s\n", HILO(off), HILO(len), 
+	LOG_TRACE_ARGS("off=(%llu), len=(%llu), cached=%s\n", off, len, 
 		       (!(flags & OCFS_BH_CACHED) || ignore_cache) ? "no" : "yes");
 
 bail:

Modified: trunk/src/ioctl.c
===================================================================
--- trunk/src/ioctl.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/ioctl.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -40,7 +40,7 @@
 	extern char *ocfs_version;
 	int ret = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %u, %lu)\n", inode, filp, cmd, arg);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %u, %lu)\n", inode, filp, cmd, arg);
 
 	if (_IOC_TYPE (cmd) != OCFS_IOC_MAGIC) {
 		ret = -ENOTTY;
@@ -64,6 +64,6 @@
 	}
 
 exit_ioctl:
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_ioctl */

Modified: trunk/src/journal.c
===================================================================
--- trunk/src/journal.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/journal.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -92,7 +92,7 @@
 	retval->k_handle = journal_start(journal, max_buffs);
 	if (IS_ERR(retval->k_handle)) {
 		LOG_ERROR_STR("journal_start() failed!");
-		LOG_ERROR_STATUS(PTR_ERR(retval->k_handle));
+		LOG_ERROR_STATUS((int)PTR_ERR(retval->k_handle));
 		retval->k_handle = NULL;
 		goto done_free;
 	}
@@ -248,7 +248,7 @@
 						    lock->inode);
 			if (tmpstat < 0) {
 				LOG_ERROR_ARGS("Could not release lock: "
-					       "%u.%u\n", HILO(id));
+					       "%llu\n", id);
 				LOG_ERROR_STATUS(tmpstat);
 				status = tmpstat;
 			}
@@ -274,7 +274,7 @@
 	int status = -ENOENT;
 	struct list_head *p1;
 	
-	LOG_ENTRY_ARGS("(%u.%u)\n", lockid);
+	LOG_ENTRY_ARGS("(%llu)\n", lockid);
 
 	/* make sure that we have a root_start off     */
 	/* this can be called early in the first mount */
@@ -783,8 +783,8 @@
 {
 	ocfs_journal_lock *lock;
 
-	LOG_ENTRY_ARGS("(id=%u.%u, type=%u, flags=%u, res=0x%08x, " 
-		       "bh=0x%08x)\n", HILO(lockres->sector_num), type, flags, 
+	LOG_ENTRY_ARGS("(id=%llu, type=%u, flags=%u, res=0x%p, " 
+		       "bh=0x%p)\n", lockres->sector_num, type, flags, 
 		       lockres, bh);
 
 	lock = ocfs_malloc(sizeof(ocfs_journal_lock));
@@ -883,9 +883,9 @@
 
 	/* should be exactly eight megs.  need to run tuneocfs otherwise. */
 	if (fe->file_size != OCFS_JOURNAL_DEFAULT_SIZE) {
-		LOG_ERROR_ARGS("Journal file size (%u) is not the default (%u).  "
+		LOG_ERROR_ARGS("Journal file size (%llu) is not the default (%u).  "
 			       "You must run tuneocfs to add a journal for this node.\n",
-			       LO(fe->file_size), OCFS_JOURNAL_DEFAULT_SIZE);
+			       fe->file_size, OCFS_JOURNAL_DEFAULT_SIZE);
 		status = -EINVAL;
 	}
 
@@ -895,15 +895,12 @@
 		goto done;
 	}
 
-	LOG_TRACE_ARGS("fe->file_size = %u.%u\n", HI(fe->file_size), 
-		       LO(fe->file_size));
-	LOG_TRACE_ARGS("fe->alloc_size = %u.%u\n", HI(fe->alloc_size), 
-		       LO(fe->alloc_size));
+	LOG_TRACE_ARGS("fe->file_size = %llu\n", fe->file_size);
+	LOG_TRACE_ARGS("fe->alloc_size = %llu\n", fe->alloc_size);
 
 	/* gonna need this later */
 	alloc_size = fe->alloc_size;
-	LOG_TRACE_ARGS("fe->this_sector = %u.%u\n", HI(fe->this_sector), 
-		       LO(fe->this_sector));
+	LOG_TRACE_ARGS("fe->this_sector = %llu\n", fe->this_sector);
 	inode->i_size = fe->file_size;
 	OCFS_BH_PUT_DATA(bh);
 	fe = NULL;
@@ -917,9 +914,8 @@
 		goto done;
 	}
 	OCFS_I(inode)->open_hndl_cnt++;
-	LOG_TRACE_ARGS("inode->alloc_size = %u.%u\n", 
-		       HI(OCFS_I(inode)->alloc_size), 
-		       LO(OCFS_I(inode)->alloc_size));
+	LOG_TRACE_ARGS("inode->alloc_size = %llu\n", 
+		       OCFS_I(inode)->alloc_size);
 
 	/* call the kernels journal init function now */
 	k_journal = journal_init_inode(inode);
@@ -1276,8 +1272,8 @@
 			status = -EINVAL;
 			goto bail;
 		}
-		LOG_TRACE_ARGS("(Run %d), lbo = %d.%d bytes, numbytes = %u "
-			       "bytes\n", run, HILO(lbo), numbytes);
+		LOG_TRACE_ARGS("(Run %d), lbo = %lld bytes, numbytes = %u "
+			       "bytes\n", run, lbo, numbytes);
 
 		/* there are actually returned in bytes. need blocks. */
 		numblks = numbytes / osb->sect_size;
@@ -1572,7 +1568,7 @@
 	struct buffer_head *publish_bh = NULL;
 	__u64 node_publ_off;
 
-	LOG_ENTRY_ARGS("(0x%08x, %u.%u)\n", osb, HI (node_num), LO (node_num));
+	LOG_ENTRY_ARGS("(0x%p, %llu)\n", osb, node_num);
 
 	/* take a lock on the publish sector */
 	down (&(osb->publish_lock));

Modified: trunk/src/namei.c
===================================================================
--- trunk/src/namei.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/namei.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -73,7 +73,7 @@
 	struct dentry *ret;
 	ocfs_super *osb = OCFS_GENERIC_SB_P(sb);
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", dir, dentry,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	if (dentry->d_name.len > OCFS_MAX_FILENAME_LENGTH) {
@@ -84,7 +84,7 @@
 
 	parentOffset = GET_INODE_VOTEOFF(dir);
 
-	LOG_TRACE_ARGS("about to call find_files_on_disk with inode=%08x\n", dir);
+	LOG_TRACE_ARGS("about to call find_files_on_disk with inode=%p\n", dir);
 
 	status = ocfs_find_files_on_disk (osb, parentOffset, &(dentry->d_name), 
 					  &fe_bh, NULL, dir, true);
@@ -93,7 +93,7 @@
 	
 	fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
 	if (!IS_VALID_FILE_ENTRY(fe)) {
-		printk("ocfs2: invalid file entry!  parent=%u.%u, name='%*s'\n",
+		printk("ocfs2: invalid file entry!  parent=%llu, name='%*s'\n",
 		       parentOffset, dentry->d_name.len, dentry->d_name.name);
 		BUG();
 	}
@@ -134,7 +134,7 @@
 	struct buffer_head *new_fe_bh = NULL;
 	struct inode *inode = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, %d, '%*s')\n", dir, dentry, mode,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, %d, '%*s')\n", dir, dentry, mode,
 			dev, dentry->d_name.len, dentry->d_name.name);
 
 	/* get our super block */
@@ -222,7 +222,7 @@
 		tmp_lockres->lock_type = DISK_LOCK_FILE_LOCK (fe);
 		if (tmp_lockres->readonly_node != OCFS_INVALID_NODE_NUM &&
 	    	    tmp_lockres->readonly_node != tmp_lockres->master_node_num) {
-			LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%u.%u\n",
+			LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%llu\n",
 					tmp_lockres->readonly_node, tmp_lockres->master_node_num,
 					tmp_lockres->sector_num);
 			tmp_lockres->readonly_node = OCFS_INVALID_NODE_NUM;
@@ -232,10 +232,10 @@
 	OCFS_BH_PUT_DATA(new_fe_bh);
 	fe = NULL;
 
-	LOG_TRACE_ARGS("Created inode %u (voteoff: %u.%u, "
-		       "feoff: %u.%u), lockres = %p\n", inode->i_ino, 
-		       HILO(GET_INODE_VOTEOFF(inode)), 
-		       HILO(GET_INODE_FEOFF(inode)), OCFS_I(inode)->lock_res);
+	LOG_TRACE_ARGS("Created inode %lu (voteoff: %llu, "
+		       "feoff: %llu), lockres = %p\n", inode->i_ino, 
+		       GET_INODE_VOTEOFF(inode), 
+		       GET_INODE_FEOFF(inode), OCFS_I(inode)->lock_res);
 
 	d_instantiate (dentry, inode);
 	ocfs_commit_trans(handle);
@@ -291,7 +291,7 @@
 	int i;
 	unsigned long blk;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, %d, '%*s')\n", dir, dentry, mode,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, %d, '%*s')\n", dir, dentry, mode,
 			dev, dentry->d_name.len, dentry->d_name.name);
 
 	if (new_fe_bh)
@@ -466,10 +466,10 @@
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", dir, dentry, mode,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", dir, dentry, mode,
                         dentry->d_name.len, dentry->d_name.name);
 	ret = ocfs_mknod (dir, dentry, mode | S_IFDIR, OCFS_NODEV);
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_mkdir */
 
@@ -485,10 +485,10 @@
 {
 	int ret;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, %d, '%*s')\n", dir, dentry, mode,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, %d, '%*s')\n", dir, dentry, mode,
                         dentry->d_name.len, dentry->d_name.name);
 	ret = ocfs_mknod (dir, dentry, mode | S_IFREG, OCFS_NODEV);
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_create */
 
@@ -500,11 +500,11 @@
 {
 	int status = -EPERM;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, 0x%08x, old='%*s' new='%*s')\n", old_dentry, dir, dentry,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, 0x%p, old='%*s' new='%*s')\n", old_dentry, dir, dentry,
                         old_dentry->d_name.len, old_dentry->d_name.name,
                         dentry->d_name.len, dentry->d_name.name);
 
-	LOG_EXIT_LONG (status);
+	LOG_EXIT_INT (status);
 	return status;
 }				/* ocfs_link */
 
@@ -523,7 +523,7 @@
 	bool do_release = false;
 	struct inode *parentInode = dentry->d_parent->d_inode;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", dir, dentry,
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, '%*s')\n", dir, dentry,
                         dentry->d_name.len, dentry->d_name.name);
 
 	inode = dentry->d_inode;
@@ -535,14 +535,14 @@
 	if (fileOff == -1)
 		BUG();
 
-	LOG_TRACE_ARGS("fileOff = %u.%u, ino = %lu\n", HILO(fileOff), inode->i_ino);
+	LOG_TRACE_ARGS("fileOff = %llu, ino = %lu\n", fileOff, inode->i_ino);
 
 	status = -EBUSY;
 
 	if (!ocfs_empty(dentry)) {
 		LOG_TRACE_STR ("dentry is not empty, cannot delete");
 	} else if (OCFS_I(inode)->open_hndl_cnt > 0) {
-		LOG_TRACE_ARGS ("Cannot remove an open file (open_hndl_cnt = %u, fileOff = %u.%u, d_count=%u)\n", OCFS_I(inode)->open_hndl_cnt, HILO(fileOff), atomic_read(&dentry->d_count));
+		LOG_TRACE_ARGS ("Cannot remove an open file (open_hndl_cnt = %u, fileOff = %llu, d_count=%u)\n", OCFS_I(inode)->open_hndl_cnt, fileOff, atomic_read(&dentry->d_count));
 	} else if (inode->i_ino == OCFS_ROOT_INODE_NUMBER) {
 		LOG_TRACE_STR ("Cannot delete the root directory");
 		status = -EPERM;
@@ -558,9 +558,9 @@
 		if (OCFS_I(inode)->num_extends) {
 			LOG_ERROR_ARGS ("Cannot remove a file with = "
 					"%u, pending extends (fileOff "
-					"= %u.%u)\n", 
+					"= %llu)\n", 
 					OCFS_I(inode)->num_extends,
-					HILO(fileOff));
+					fileOff);
 			spin_unlock(&oin_num_ext_lock);
 			status = -EBUSY;
 			goto bail;
@@ -613,7 +613,7 @@
 #endif
 		ocfs_bh_sem_hash_cleanup_pid(ocfs_getpid());
 
-	LOG_EXIT_LONG (retval);
+	LOG_EXIT_INT (retval);
 	return retval;
 }				/* ocfs_unlink */
 
@@ -639,8 +639,8 @@
 	struct buffer_head **tmpbh;
 	struct inode *tmpinode;
 
-	LOG_ENTRY_ARGS("(lock_id1 = %u.%u, lock_id2 = %u.%u)\n", HILO(id1), 
-		       HILO(id2));
+	LOG_ENTRY_ARGS("(lock_id1 = %llu, lock_id2 = %llu)\n", id1, 
+		       id2);
 
 	if (*bh1)
 		*bh1 = NULL;
@@ -745,9 +745,9 @@
 		goto bail;
 	}
 
-	LOG_TRACE_ARGS("fe->this_sector = %u.%u, fe->local_ext = %s, "
+	LOG_TRACE_ARGS("fe->this_sector = %llu, fe->local_ext = %s, "
 		       "fe->next_free_ext = %u\n",
-		       HILO(fe->this_sector), 
+		       fe->this_sector, 
 		       (fe->local_ext) ? "true" : "false",
 		       fe->next_free_ext);
 
@@ -930,7 +930,7 @@
 	__u32 newfe_lockid = 0;
 	int needs_trunc = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, 0x%08x, 0x%08x, from='%*s' to='%*s')\n",
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, 0x%p, 0x%p, from='%*s' to='%*s')\n",
 			old_dir, old_dentry, new_dir, new_dentry,
                         old_dentry->d_name.len, old_dentry->d_name.name,
                         new_dentry->d_name.len, new_dentry->d_name.name);
@@ -1184,8 +1184,8 @@
 			LOG_ERROR_STATUS (status);
 			goto finally;
 		}
-		LOG_TRACE_ARGS("(after) tmpfe->this_sector = %u.%u\n", 
-			       HILO(tmpfe->this_sector));
+		LOG_TRACE_ARGS("(after) tmpfe->this_sector = %llu\n", 
+			       tmpfe->this_sector);
 
 		/* move the inode offset over to the new entry */
 		status = ocfs_ugly_rename_lockres(osb, 
@@ -1332,7 +1332,7 @@
 	ocfs_lock_res *lockres = NULL;
 
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, symname='%s' actual='%*s')\n", dir, 
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, symname='%s' actual='%*s')\n", dir, 
 			dentry, symname, dentry->d_name.len, 
 			dentry->d_name.name);
 
@@ -1395,7 +1395,7 @@
 	status = ocfs_extend_file (osb, newsize, file_off, handle, inode, NULL);
 	if (status < 0) {
 		if (status != -ENOSPC && status != -EINTR) {
-			LOG_ERROR_ARGS ("Failed to extend file to %u.%u", HILO (newsize));
+			LOG_ERROR_ARGS ("Failed to extend file to %llu", newsize);
 			LOG_ERROR_STATUS(status);
 			status = -ENOSPC;
 		}
@@ -1839,10 +1839,10 @@
 
 	if (inode && status == 0 && !(flags & FLAG_DEL_INODE)) {
 		SET_INODE_DELETED(inode);
-//		printk("ocfs2: removing inode %lu, voteoff = %u.%u, "
-//		       "feoff = %u.%u, count = %u\n", inode->i_ino, 
-//		       HILO(GET_INODE_VOTEOFF(inode)), 
-//		       HILO(GET_INODE_FEOFF(inode)), 
+//		printk("ocfs2: removing inode %lu, voteoff = %llu, "
+//		       "feoff = %llu, count = %u\n", inode->i_ino, 
+//		       GET_INODE_VOTEOFF(inode), 
+//		       GET_INODE_FEOFF(inode), 
 //		       atomic_read(&inode->i_count));
 		ocfs_inode_hash_remove(&osb->inode_hash, 
 				       GET_INODE_VOTEOFF(inode));

Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/nm.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -178,13 +178,13 @@
 	ocfs_publish * publish;
 	struct ocfs_sched_vote *sv = NULL;
 
-	LOG_ENTRY_ARGS("(vote_node = %d, bh = 0x%x)\n", vote_node, bh);
+	LOG_ENTRY_ARGS("(vote_node = %d, bh = 0x%p)\n", vote_node, bh);
 
 	publish = (ocfs_publish *) OCFS_BH_GET_DATA_READ(bh); /* read */
 
 	if (osb->last_publ_seq_num[vote_node] == publish->publ_seq_num){
-		LOG_TRACE_ARGS("Already voted on node %d, seqnum (%u.%u)\n", 
-			       vote_node, HILO(publish->publ_seq_num));
+		LOG_TRACE_ARGS("Already voted on node %d, seqnum (%llu)\n", 
+			       vote_node, publish->publ_seq_num);
 		OCFS_BH_PUT_DATA(bh);
 		status = 0;
 		goto bail;
@@ -356,7 +356,7 @@
 			atomic_inc (&osb->nm_init);
 		}
 
-		LOG_TRACE_ARGS ("Publish map: 0x%08x\n", LO (osb->publ_map));
+		LOG_TRACE_ARGS ("Publish map: 0x%08X\n", (__u32)(osb->publ_map & 0xFFFFFFFFULL));
 
 		/* map of local node */
 		curr_node_map = (__u64) ((__u64)1 << osb->node_num);
@@ -477,7 +477,7 @@
 
 	complete (&(osb->dlm_complete));
 eek:
-	LOG_EXIT_LONG (0);
+	LOG_EXIT_INT (0);
 	return 0;
 }				/* ocfs_volume_thread */
 
@@ -498,7 +498,7 @@
 	int status = 0;
 	ocfs_file_entry *fe;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, 0x%08x)\n", osb, lockres, bh);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p, 0x%p)\n", osb, lockres, bh);
 
 	/* Don't sync-read if we already own the lock as it may not
 	 * have hit disk yet. */
@@ -512,8 +512,8 @@
 
 	status = ocfs_acquire_lockres_ex (lockres, timeout);
 	if (status < 0) {
-		LOG_TRACE_ARGS ("Timedout locking lockres for id: %u.%u\n",
-				HILO (lockres->sector_num));
+		LOG_TRACE_ARGS ("Timedout locking lockres for id: %llu\n",
+				lockres->sector_num);
 		goto finally;
 	}
 
@@ -524,7 +524,7 @@
 
 	if (lockres->readonly_node != OCFS_INVALID_NODE_NUM &&
     	    lockres->readonly_node != lockres->master_node_num) {
-		LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%u.%u\n",
+		LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%llu\n",
 				lockres->readonly_node, lockres->master_node_num,
 				lockres->sector_num);
 		lockres->readonly_node = OCFS_INVALID_NODE_NUM;
@@ -561,8 +561,8 @@
 	ocfs_lock_res *tmp_lockres = NULL;
 	struct buffer_head *tmpbh = NULL, **b = NULL;
 
-	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, 0x%08x, 0x%08x, 0x%08x)\n", osb,
-			HI (lock_id), LO (lock_id), lockres, bh, updated);
+	LOG_ENTRY_ARGS ("(0x%p, %llu, 0x%p, 0x%p, 0x%p)\n", osb,
+			lock_id, lockres, bh, updated);
 
 	if (bh == NULL)
 		b = &tmpbh;
@@ -668,8 +668,8 @@
 	__u64 lockid = lockres ? lockres->sector_num : 0ULL;
 	ocfs_vote_obj_lookup_data data;
 
-	LOG_ENTRY_ARGS("(status=%d, lockid=%u.%u, node_num=%d, flags=%08x)\n", status,
-		       HILO(lockid), node_num, flags);
+	LOG_ENTRY_ARGS("(status=%d, lockid=%llu, node_num=%d, flags=%08x)\n", status,
+		       lockid, node_num, flags);
 
 	*master_alive = true;
 	if (status < 0) {
@@ -812,7 +812,7 @@
 	__u64 lock_id, seq_num, fe_off;
 	int needs_trunc = 0;
 
-	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x)\n", osb, ctxt);
+	LOG_ENTRY_ARGS ("(0x%p, 0x%p)\n", osb, ctxt);
 
 	down(&osb->vote_sem);
 
@@ -839,8 +839,8 @@
 	}
 	lockflags = (lock_id >= osb->vol_layout.bitmap_off ? OCFS_BH_CACHED : 0);
 	
-	LOG_TRACE_ARGS ("node=%u, id=%u.%u, seq=%u.%u\n", node_num,
-			HILO (lock_id), HILO (seq_num));
+	LOG_TRACE_ARGS ("node=%u, id=%llu, seq=%llu\n", node_num,
+			lock_id, seq_num);
 
 	/* delete / rename is slightly different -- we don't want to
 	 * look up the inode in the release case -- it should already
@@ -877,8 +877,8 @@
 	} else {
 		status = ocfs_acquire_lockres_ex (lockres, (OCFS_NM_HEARTBEAT_TIME/2));
 		if (status < 0) {
-			LOG_TRACE_ARGS ("Timedout locking lockres for id: %u.%u\n",
-				HILO (lockres->sector_num));
+			LOG_TRACE_ARGS ("Timedout locking lockres for id: %llu\n",
+				lockres->sector_num);
 			ocfs_put_lockres(lockres);
 			goto leave;
 		}
@@ -888,9 +888,9 @@
 					    status, &master_alive, inode);
 
 #ifdef VERBOSE_PROCESS_VOTE
-	printk("(%u) ocfs_process_vote: %s request for lockid: %u.%u, fe_off: %u.%u, action: (%u) %s, type: %s\n", ocfs_getpid(),
+	printk("(%u) ocfs_process_vote: %s request for lockid: %llu, fe_off: %llu, action: (%u) %s, type: %s\n", ocfs_getpid(),
 	       flags & FLAG_RELEASE_LOCK ? "RELEASE" : 
-	       (flags & FLAG_ACQUIRE_LOCK ? "ACQUIRE" : "MODIFY"), HILO(lock_id), HILO(fe_off),
+	       (flags & FLAG_ACQUIRE_LOCK ? "ACQUIRE" : "MODIFY"), lock_id, fe_off,
 	       vote_type, process_vote_strings[vote_type], disk_vote ? "disk vote" : "net vote" );
 #endif
 	/* get_process_vote_action will only allow CHANGE_MASTER, RELEASE_CACHE, and
@@ -1089,8 +1089,8 @@
 
 			/* requestor will need to retry if anyone is using the lockres */
 			if (lockres->lock_holders > 0) {
-				LOG_TRACE_ARGS("Lock id (%u.%u) has %u holders\n", 
-				       HILO(lockres->sector_num), lockres->lock_holders);
+				LOG_TRACE_ARGS("Lock id (%llu) has %u holders\n", 
+				       lockres->sector_num, lockres->lock_holders);
 				down(&(osb->journal.commit_sem));
 				if (ocfs_search_commited(osb, lockres)) {
 					// kick the commit thread
@@ -1255,9 +1255,9 @@
 			if (lockres->master_node_num != node_num ||
 			    lockres->lock_type != OCFS_DLM_ENABLE_CACHE_LOCK ||
 			    lockres->readonly_map != 0ULL)
-				LOG_ERROR_ARGS("(drop-ro) master=%d node_num=%d locktype=%d map=%08x.%08x ronode=%d\n",
+				LOG_ERROR_ARGS("(drop-ro) master=%d node_num=%d locktype=%d map=%16llX ronode=%d\n",
 				       lockres->master_node_num, node_num, lockres->lock_type, 
-				       HILO(lockres->readonly_map), lockres->readonly_node);
+				       lockres->readonly_map, lockres->readonly_node);
 			else
 				lockres->readonly_node = OCFS_INVALID_NODE_NUM;
 
@@ -1371,7 +1371,7 @@
 	}
 
 #ifdef VERBOSE_PROCESS_VOTE
-	printk("(%u) vote: lockid=%u.%u, node=%d, seqnum=%u.%u, response=%d, open_handle=%s\n",ocfs_getpid(), HILO(lock_id), node_num, HILO(seq_num), vote_response, open_handle?"yes":"no");
+	printk("(%u) vote: lockid=%llu, node=%d, seqnum=%llu, response=%d, open_handle=%s\n",ocfs_getpid(), lock_id, node_num, seq_num, vote_response, open_handle?"yes":"no");
 #endif
 		       
 	if (status < 0)

Modified: trunk/src/oin.c
===================================================================
--- trunk/src/oin.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/oin.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -230,7 +230,7 @@
 
 		if (lockres->readonly_node != OCFS_INVALID_NODE_NUM &&
 		    lockres->readonly_node != lockres->master_node_num) {
-			LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%u.%u\n",
+			LOG_ERROR_ARGS("no longer readonly! ronode=%d, master=%d, lockid=%llu\n",
 				       lockres->readonly_node, lockres->master_node_num,
 				       lockres->sector_num);
 			lockres->readonly_node = OCFS_INVALID_NODE_NUM;

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/proc.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -83,7 +83,7 @@
 		create_proc_read_entry (p->name, 0, NULL, p->read_proc,
 					p->data);
 
-	LOG_EXIT_LONG (0);
+	LOG_EXIT_INT (0);
 	return 0;
 }				/* ocfs_proc_init */
 
@@ -183,10 +183,10 @@
 			if (item->u.slab == OcfsGlobalCtxt.lockres_cache) {
 				ocfs_lock_res *lockres = item->address;
 				sprintf(tmpstr,
-				       	"%08x  %9s  %-40s  %5d  %u.%u\n",
+				       	"%08x  %9s  %-40s  %5d  %llu\n",
 				       	item->address, slabname, item->tag,
 				       	atomic_read(&lockres->lr_ref_cnt),
-				       	HILO(lockres->sector_num));
+				       	lockres->sector_num);
 			} else
 				sprintf(tmpstr, "%08x  %9s  %-40s\n", item->address,
 				       	slabname, item->tag);
@@ -255,7 +255,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_version */
 
@@ -321,7 +321,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_dlm_stats */
 
@@ -368,7 +368,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 
 	return(ret);
 }
@@ -393,7 +393,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_version */
 
@@ -416,7 +416,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_nodenum */
 
@@ -438,7 +438,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_nodename */
 
@@ -556,7 +556,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_mountpoint */
 
@@ -594,20 +594,20 @@
 		*(ptr - 1) = '\0';
 
 #define PROC_STATS                             \
-  "File open count          : %d.%u\n"         \
-  "Publish map              : %s\n"            \
-  "Number of nodes          : %u\n"            \
-  "Cluster size             : %u\n"            \
-  "Volume size              : %u.%u\n"         \
-  "Dir node size            : %u.%u\n"         \
-  "File node size           : %u.%u\n"         \
-  "Failed Large Allocs      : %u\n"            \
-  "Retry Large Allocs       : %u\n"            \
+  "File open count          : %lld\n"		\
+  "Publish map              : %s\n"		\
+  "Number of nodes          : %u\n"		\
+  "Cluster size             : %u\n"		\
+  "Volume size              : %llu\n"		\
+  "Dir node size            : %llu\n"		\
+  "File node size           : %llu\n"		\
+  "Failed Large Allocs      : %u\n"		\
+  "Retry Large Allocs       : %u\n"		\
   "Inode Hash Objects       : %u\n"
 
-	len = sprintf (page, PROC_STATS, HILO (osb->file_open_cnt), pubmap,
-		       vol->num_nodes, vol->cluster_size, HILO (vol->size),
-		       HILO (vol->dir_node_size), HILO (vol->file_node_size),
+	len = sprintf (page, PROC_STATS, osb->file_open_cnt, pubmap,
+		       vol->num_nodes, vol->cluster_size, vol->size,
+		       vol->dir_node_size, vol->file_node_size,
 		       osb->cluster_bitmap.failed, 
 		       osb->cluster_bitmap.ok_retries, 
 		       osb->inode_hash.num_ents);
@@ -616,7 +616,7 @@
 
 bail:
 	ocfs_safefree (pubmap);
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_statistics */
 
@@ -642,7 +642,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_hash_stats */
 
@@ -664,7 +664,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_device */
 
@@ -709,7 +709,7 @@
 
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_nodes */
 
@@ -736,7 +736,7 @@
 	ret = ocfs_lookup_vote_request_obj (osb, &d);
 	ret = ocfs_proc_calc_metrics (page, start, off, count, eof, len);
 
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_proc_net_vote_obj */
 

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/super.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -389,7 +389,7 @@
 		goto bail;
 	}
 
-	LOG_TRACE_ARGS("strlen(options) = %d, options = \"%s\"\n", strlen(options), options);
+	LOG_TRACE_ARGS("strlen(options) = %u, options = \"%s\"\n", (unsigned int)strlen(options), options);
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
         while ( (c = strsep(&options, ",")) != NULL)
@@ -432,7 +432,7 @@
 	ret = 0;
 
 bail:
-	LOG_EXIT_LONG (ret);
+	LOG_EXIT_INT (ret);
 	return ret;
 }				/* ocfs_parse_options */
 
@@ -705,7 +705,7 @@
  */
 static void ocfs_put_super (struct super_block *sb)
 {
-	LOG_ENTRY_ARGS ("(0x%08x)\n", sb);
+	LOG_ENTRY_ARGS ("(0x%p)\n", sb);
 
 	ocfs_sync_blockdev(sb);
 	LOG_TRACE_STR ("put super... do nothing!  DONE!!!!");
@@ -783,7 +783,7 @@
 	unlock_buffer(bh);
 	brelse(bh);
 
-        LOG_EXIT_LONG (0);
+        LOG_EXIT_INT (0);
         return 0;
 }                               /* ocfs_statfs */
 
@@ -1082,7 +1082,7 @@
 	__u32 tempmap;
 	int i;
 
-	LOG_ENTRY_ARGS ("(0x%08x)\n", sb);
+	LOG_ENTRY_ARGS ("(0x%p)\n", sb);
 
 	if (sb == NULL) {
 		LOG_ERROR_STATUS (status = -EFAIL);

Modified: trunk/src/symlink.c
===================================================================
--- trunk/src/symlink.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/symlink.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -121,7 +121,7 @@
 	struct inode *inode = data;
 	ocfs_super *osb = OCFS_GENERIC_SB_P(inode->i_sb);
 
-        sprintf(buf,"%ld",osb->node_num);
+        sprintf(buf,"%lu", (unsigned long)osb->node_num);
         l = strlen(buf);
 
         if (str) {

Modified: trunk/src/sysfile.c
===================================================================
--- trunk/src/sysfile.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/sysfile.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -58,10 +58,10 @@
 	int flags = OCFS_BH_CACHED;
 	bool bWriteThru = false;
 
-	LOG_ENTRY_ARGS ("(FileId = %u, metadatafile = %u, offset = (%u.%u), "
-			"Length = (%u.%u))\n", FileId, 
-			OCFS_FILE_VOL_META_DATA + osb->node_num, HILO(Offset),
-			HILO(Length));
+	LOG_ENTRY_ARGS ("(FileId = %u, metadatafile = %u, offset = (%llu), "
+			"Length = (%llu))\n", FileId, 
+			OCFS_FILE_VOL_META_DATA + osb->node_num, Offset,
+			Length);
 
 	if ((FileId == (OCFS_FILE_VOL_LOG_FILE + osb->node_num)) ||
 	    (FileId == (OCFS_FILE_VOL_META_DATA + osb->node_num))) {
@@ -186,7 +186,7 @@
 	if (Buffer)
 		vfree(Buffer);
 
-	LOG_EXIT_ARGS ("%u.%u", HI (StartOffset), LO (StartOffset));
+	LOG_EXIT_ARGS ("%llu", StartOffset);
 	return StartOffset;
 }				/* ocfs_file_to_disk_off */
 
@@ -225,7 +225,7 @@
 	fe = (ocfs_file_entry *) OCFS_BH_GET_DATA_READ(fe_bh); /* read */
 
 	if (!IS_VALID_FILE_ENTRY (fe)) {
-		LOG_ERROR_ARGS("offset=%u.%u", HILO (offset));
+		LOG_ERROR_ARGS("offset=%llu", offset);
 		status = -EINVAL;
 		goto leave;
 	}
@@ -266,8 +266,7 @@
 	char *data;
 	struct buffer_head **bhs;
 
-	LOG_ENTRY_ARGS ("(FileId = %u, Size = %u.%u)\n", FileId, HI (FileSize),
-			LO (FileSize));
+	LOG_ENTRY_ARGS ("(FileId = %u, Size = %llu)\n", FileId, FileSize);
 
 	OCFS_ASSERT (osb);
 

Modified: trunk/src/util.c
===================================================================
--- trunk/src/util.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/util.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -326,7 +326,7 @@
 
 void ocfs_truncate_inode_pages(struct inode *inode, loff_t off)
 {
-	LOG_TRACE_ARGS ("truncating pages for inode %lu (%p) from offset %u.%u\n", inode->i_ino, inode, off);
+	LOG_TRACE_ARGS ("truncating pages for inode %lu (%p) from offset %llu\n", inode->i_ino, inode, off);
 	truncate_inode_pages(&inode->i_data, off);
 }				/* ocfs_truncate_inode_pages */
 
@@ -406,7 +406,7 @@
                 addr = *stack++;
                 if (ocfs_kernel_text_address(addr)) {
                 //        lookup_symbol(addr, buffer, 512);
-                        printk("[<%08lx>] %s (0x%x)\n", addr," ",stack-1);
+                        printk("[<%08lx>] %s (0x%p)\n", addr," ",stack-1);
                 }
         }
         printk("\n");

Modified: trunk/src/volcfg.c
===================================================================
--- trunk/src/volcfg.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/volcfg.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -76,12 +76,12 @@
 	}
 
 	if (atomic_read (&osb->lock_stop)) {
-		LOG_TRACE_ARGS ("Last Lock written : %d\n", jiffies);
+		LOG_TRACE_ARGS ("Last Lock written : %lu\n", jiffies);
 		atomic_set (&osb->lock_event_woken, 1);
 		brelse(bh);
 		wake_up (&osb->lock_event);
 	} else {
-		LOG_TRACE_ARGS ("Lock written : %d\n", jiffies);
+		LOG_TRACE_ARGS ("Lock written : %lu\n", jiffies);
 		mod_timer (&osb->lock_timer, jiffies + OCFS_VOLCFG_LOCK_ITERATE);
 	}
 
@@ -400,7 +400,7 @@
 			lock_buf = NULL;
 
 			/* Set timer to reiterate lock every few jiffies */
-			LOG_TRACE_ARGS ("Start Timer: %d\n", jiffies);
+			LOG_TRACE_ARGS ("Start Timer: %lu\n", jiffies);
 			osb->lock_timer.expires = jiffies +
 						  OCFS_VOLCFG_LOCK_ITERATE;
 			/* we get_bh here because we brelse later in
@@ -953,7 +953,7 @@
 	    strncmp (ipc->ip_mask, g_ipc->ip_mask, MAX_IP_ADDR_LEN))
 		chg = true;
 
-	LOG_EXIT_LONG (chg);
+	LOG_EXIT_INT (chg);
 	return chg;
 }				/* ocfs_has_node_config_changed */
 

Modified: trunk/src/vote.c
===================================================================
--- trunk/src/vote.c	2004-04-30 20:12:32 UTC (rev 888)
+++ trunk/src/vote.c	2004-05-04 22:25:00 UTC (rev 889)
@@ -142,10 +142,11 @@
 	struct sockaddr_in sin;
 	mm_segment_t oldfs;
 
-	LOG_ENTRY_ARGS ("(votemap=0x%x)\n", LO(votemap));
+	LOG_ENTRY_ARGS ("(votemap=0x%x)\n",
+			(__u32)(votemap & 0xFFFFFFFFULL));
 
 	oldfs = get_fs ();
-	for (map = LO(votemap), num = 0; map != 0; map >>= 1, num++) {
+	for (map = (__u32)(votemap & 0xFFFFFFFFULL), num = 0; map != 0; map >>= 1, num++) {
 		if (num == osb->node_num)
 			continue;
 
@@ -368,7 +369,7 @@
 	bret = true;
 
 bail:
-	LOG_EXIT_LONG (bret);
+	LOG_EXIT_INT (bret);
 	return bret;
 }				/* ocfs_check_ipc_msg */
 
@@ -391,19 +392,28 @@
 	switch (dlm_msg->msg_type) {
 		case OCFS_VOTE_REQUEST:
 			request = (ocfs_dlm_msg_hdr *) dlm_msg->msg_buf;
-			ret = snprintf(p, max, "REQST: %d %c %3d %08x %10u.%-10u %10u.%-10u %08x | %08x %08x\n",
-				obj->pid, vote_state_str[obj->vote_state], obj->vote_status,
-				LO(obj->req_vote_map), HILO(request->lock_id),
-				HILO(request->lock_seq_num), request->flags, 
-				LO(obj->got_vote_map), LO(obj->tmp_openmap));
+			ret = snprintf(p, max, "REQST: %d %c %3d %08x %21llu %21llu %08x | %08x %08x\n",
+				obj->pid,
+				vote_state_str[obj->vote_state],
+				obj->vote_status,
+				(__u32)(obj->req_vote_map & 0xFFFFFFFFULL),
+				request->lock_id,
+				request->lock_seq_num, request->flags, 
+				(__u32)(obj->got_vote_map & 0xFFFFFFFFULL),
+				(__u32)(obj->tmp_openmap & 0xFFFFFFFFULL));
 			break;
 		case OCFS_VOTE_REPLY:
 			reply = (ocfs_dlm_reply_master *) dlm_msg->msg_buf;
-			ret = snprintf(p, max, "REPLY: %d %c %3d %08x %10u.%10u %10u.%10u %08x | %3d %c\n",
-				obj->pid, vote_state_str[obj->vote_state], obj->vote_status,
-				LO(obj->req_vote_map), HILO(reply->h.lock_id),
-				HILO(reply->h.lock_seq_num), reply->h.flags, 
-				reply->status, reply->h.open_handle ? 'Y' : 'N');
+			ret = snprintf(p, max, "REPLY: %d %c %3d %08x %21llu %21llu %08x | %3d %c\n",
+				obj->pid,
+				vote_state_str[obj->vote_state],
+				obj->vote_status,
+				(__u32)(obj->req_vote_map & 0xFFFFFFFFULL),
+				reply->h.lock_id,
+				reply->h.lock_seq_num,
+				reply->h.flags, 
+				reply->status,
+				reply->h.open_handle ? 'Y' : 'N');
 
 			break;
 		case OCFS_INFO_DISMOUNT:
@@ -453,9 +463,9 @@
 		    obj->vote_state == VOTE_OBJ_STATE_UNSENT ||
 		    req->lock_id != data->u.s.lock_id) {
 			LOG_ERROR_ARGS("bad message: vote_state=%d type=%d "
-				       "lockid=%u.%u expected=%u.%u\n",
+				       "lockid=%llu expected=%llu\n",
 				      obj->vote_state, dlm_msg->msg_type,
-				      HILO(req->lock_id), HILO(data->u.s.lock_id));
+				      req->lock_id, data->u.s.lock_id);
 			status = -EINVAL;
 		}
 	}
@@ -533,18 +543,17 @@
 	spin_lock(&obj->lock);
 	if (obj->vote_state != VOTE_OBJ_STATE_SENT &&
 	    obj->vote_state != VOTE_OBJ_STATE_PARTIAL_REPLY) {
-		LOG_ERROR_ARGS("bad vote reply state=%d, node=%u, lockid=%u.%u, seq=%u.%u, vote=%d\n",
-			       obj->vote_state, dlm_msg->src_node, HI(reply_msg->lock_id),
-			       LO(reply_msg->lock_id), HI(reply_msg->lock_seq_num),
-			       LO(reply_msg->lock_seq_num), reply->status);
+		LOG_ERROR_ARGS("bad vote reply state=%d, node=%u, lockid=%llu, seq=%llu, vote=%d\n",
+			       obj->vote_state, dlm_msg->src_node,
+			       reply_msg->lock_id,
+			       reply_msg->lock_seq_num, reply->status);
 		status = -EINVAL;
 		goto unlock;
 	}
 
-	LOG_TRACE_ARGS("node=%u, lockid=%u.%u, seq=%u.%u, vote=%d\n",
-		       dlm_msg->src_node, HI(reply_msg->lock_id),
-		       LO(reply_msg->lock_id), HI(reply_msg->lock_seq_num),
-		       LO(reply_msg->lock_seq_num), reply->status);
+	LOG_TRACE_ARGS("node=%u, lockid=%llu, seq=%llu, vote=%d\n",
+		       dlm_msg->src_node, reply_msg->lock_id,
+		       reply_msg->lock_seq_num, reply->status);
 	
 	ctxt.reply_method = COMM_VOTE;
 	ctxt.got_vote_map = &(obj->got_vote_map);
@@ -688,7 +697,8 @@
 	ocfs_vote_obj *obj;
 	__u32 msg_len, obj_len;
 
-	LOG_ENTRY_ARGS ("(osb=0x%08x, vm=0x%08x)\n", osb, LO(vote_map));
+	LOG_ENTRY_ARGS ("(osb=0x%p, vm=0x%08x)\n", osb,
+			(__u32)(vote_map & 0xFFFFFFFFULL));
 
 	msg_len = sizeof (ocfs_dlm_msg) + sizeof (ocfs_dlm_req_master);
 	obj_len = sizeof (ocfs_vote_obj) + sizeof (ocfs_dlm_req_master);
@@ -792,8 +802,9 @@
 	ocfs_vote_obj *obj;
 	__u32 msg_len, obj_len;
 
-	LOG_ENTRY_ARGS ("(osb=0x%08x, id=%u.%u, ty=%u, fl=%u, vm=0x%08x)\n",
-			osb, HILO (lock_id), lock_type, flags, LO(vote_map));
+	LOG_ENTRY_ARGS ("(osb=0x%p, id=%llu, ty=%u, fl=%u, vm=0x%08x)\n",
+			osb, lock_id, lock_type, flags,
+			(__u32)(vote_map & 0xFFFFFFFFULL));
 
 	msg_len = sizeof (ocfs_dlm_msg) + sizeof (ocfs_dlm_req_master);
 	obj_len = sizeof (ocfs_vote_obj) + sizeof (ocfs_dlm_req_master);
@@ -820,8 +831,8 @@
 		req->fe_off = 0;
 
 #ifdef VERBOSE_LOCKING_TRACE
-	printk("ocfs_send_dlm_request_msg: inode=%p, lockid = %u.%u, "
-	       "fe_off=%u.%u\n", inode, HILO(lock_id), HILO(req->fe_off));
+	printk("ocfs_send_dlm_request_msg: inode=%p, lockid = %llu, "
+	       "fe_off=%llu\n", inode, lock_id, req->fe_off);
 #endif
 
 	spin_lock(&osb->vote_obj_queue_lock);
@@ -841,12 +852,15 @@
  	    	if (flags & (FLAG_FILE_EXTEND | FLAG_FILE_UPDATE)) 
 			// extend and update need to update the openmap
 			lockres->oin_openmap = obj->tmp_openmap;
-		LOG_TRACE_ARGS ("OK vote, lockid=%u.%u, map: 0x%08x\n",
-			HILO(lockres->sector_num), LO(obj->got_vote_map));
+		LOG_TRACE_ARGS ("OK vote, lockid=%llu, map: 0x%08x\n",
+			lockres->sector_num,
+			(__u32)(obj->got_vote_map & 0xFFFFFFFFULL));
 	} else {
-		LOG_ERROR_ARGS("vote_status=%d, vote_state=%d, lockid=%u.%u, map=0x%08x, got=0x%08x\n",
-			       obj->vote_status, obj->vote_state, HILO(lockres->sector_num),
-			       LO(obj->req_vote_map), LO(obj->got_vote_map));
+		LOG_ERROR_ARGS("vote_status=%d, vote_state=%d, lockid=%llu, map=0x%08x, got=0x%08x\n",
+			       obj->vote_status, obj->vote_state,
+			       lockres->sector_num,
+			       (__u32)(obj->req_vote_map & 0xFFFFFFFFULL),
+			       (__u32)(obj->got_vote_map & 0xFFFFFFFFULL));
 	}
 	*vote_status = obj->vote_status;
 	obj->vote_state = VOTE_OBJ_STATE_DESTROYING;



More information about the Ocfs2-commits mailing list