# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1532  -> 1.1533 
#	    fs/xfs/xfsidbg.c	1.37    -> 1.38   
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/12/04	jbarnes@tomahawk.engr.sgi.com	1.1533
# kdb xfs fixes
# --------------------------------------------
#
diff -Nru a/fs/xfs/xfsidbg.c b/fs/xfs/xfsidbg.c
--- a/fs/xfs/xfsidbg.c	Thu Dec  4 16:27:10 2003
+++ b/fs/xfs/xfsidbg.c	Thu Dec  4 16:27:10 2003
@@ -1439,7 +1439,7 @@
 #endif	/* CONFIG_XFS_VNODE_TRACING */
 
 	kdb_printf("   v_vfsp 0x%p v_number %Lx\n",
-		vp->v_vfsp, vp->v_number);
+		vp->v_vfsp, (unsigned long long)vp->v_number);
 }
 
 
@@ -1691,7 +1691,7 @@
 					ip->i_state);
 
 	kdb_printf(" i_hash.nxt = 0x%p i_hash.prv = 0x%p\n",
-					ip->i_hash.next, ip->i_hash.prev);
+					ip->i_hash.next, ip->i_hash.pprev);
 	kdb_printf(" i_list.nxt = 0x%p i_list.prv = 0x%p\n",
 					ip->i_list.next, ip->i_list.prev);
 	kdb_printf(" i_dentry.nxt = 0x%p i_dentry.prv = 0x%p\n",
@@ -2847,19 +2847,19 @@
 	static char rval[16];
 
 	sprintf(rval, "%c%c%c%c%c%c%c%c%c%c%c%c%c",
-		"?fc?dxb?r?l?S?m?"[(m & IFMT) >> 12],
-		m & ISUID ? 'u' : '-',
-		m & ISGID ? 'g' : '-',
-		m & ISVTX ? 'v' : '-',
-		m & IREAD ? 'r' : '-',
-		m & IWRITE ? 'w' : '-',
-		m & IEXEC ? 'x' : '-',
-		m & (IREAD >> 3) ? 'r' : '-',
-		m & (IWRITE >> 3) ? 'w' : '-',
-		m & (IEXEC >> 3) ? 'x' : '-',
-		m & (IREAD >> 6) ? 'r' : '-',
-		m & (IWRITE >> 6) ? 'w' : '-',
-		m & (IEXEC >> 6) ? 'x' : '-');
+		"?fc?dxb?r?l?S?m?"[(m & S_IFMT) >> 12],
+		m & S_ISUID ? 'u' : '-',
+		m & S_ISGID ? 'g' : '-',
+		m & S_ISVTX ? 'v' : '-',
+		m & S_IRUSR ? 'r' : '-',
+		m & S_IWUSR ? 'w' : '-',
+		m & S_IXUSR ? 'x' : '-',
+		m & (S_IRUSR >> 3) ? 'r' : '-',
+		m & (S_IWUSR >> 3) ? 'w' : '-',
+		m & (S_IXUSR >> 3) ? 'x' : '-',
+		m & (S_IRUSR >> 6) ? 'r' : '-',
+		m & (S_IWUSR >> 6) ? 'w' : '-',
+		m & (S_IXUSR >> 6) ? 'x' : '-');
 	return rval;
 }