diff -Naurp -X /home/jbarnes/dontdiff 270-kdb-v4.3-ia64.patch/fs/xfs/xfsidbg.c 280-kdb-v4.3-xfsidbg.patch/fs/xfs/xfsidbg.c --- 270-kdb-v4.3-ia64.patch/fs/xfs/xfsidbg.c Wed Dec 17 18:59:18 2003 +++ 280-kdb-v4.3-xfsidbg.patch/fs/xfs/xfsidbg.c Tue Dec 30 15:29:43 2003 @@ -1439,7 +1439,7 @@ static void printvnode(vnode_t *vp) #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 @@ static void printinode(struct inode *ip) 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 @@ xfs_fmtmode(int m) 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; }