Merge ssh://lord@kernel.bkbits.net/xfs-2.6

into penguin.americas.sgi.com:/src/lord/bitkeeper/xfs-2.6

fs/xfs/xfs_da_btree.c

@@ -2166,9 +2166,9 @@ xfs_da_do_buf(
 			if (xfs_error_level >= XFS_ERRLEVEL_LOW) {
 				int	i;
 				cmn_err(CE_ALERT, "xfs_da_do_buf: bno %lld\n",
-					bno);
+					(long long)bno);
 				cmn_err(CE_ALERT, "dir: inode %lld\n",
-					dp->i_ino);
+					(long long)dp->i_ino);
 				for (i = 0; i < nmap; i++) {
 					cmn_err(CE_ALERT,
 						"[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d\n",

fs/xfs/xfs_dir2_node.c

@@ -1612,7 +1612,8 @@ xfs_dir2_node_addname_int(
 			if (XFS_DIR2_DB_TO_FDB(mp, dbno) != fbno) {
 				cmn_err(CE_ALERT,
 		"xfs_dir2_node_addname_int: needed block %lld, got %lld\n",
-					XFS_DIR2_DB_TO_FDB(mp, dbno), fbno);
+					(long long)XFS_DIR2_DB_TO_FDB(mp, dbno),
+					(long long)fbno);
 				XFS_ERROR_REPORT("xfs_dir2_node_addname_int",
 						 XFS_ERRLEVEL_LOW, mp);
 				return XFS_ERROR(EFSCORRUPTED);