diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h index 4ac1503d57fe88f2188b37a1cf402e6b460521c7..40b0f4c54d9e5fe2409c39e1da5ebf66a355042b 100644 --- a/fs/xfs/support/debug.h +++ b/fs/xfs/support/debug.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -42,6 +42,7 @@ #define CE_PANIC 0 /* panic */ extern void icmn_err(int, char *, va_list); +/* PRINTFLIKE2 */ extern void cmn_err(int, char *, ...); #ifndef STATIC diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index 349b48a45ac7dcb1e996c018be76b9fe82b3c175..d550aa03012957c3c71b1a11a96a58ef658ca424 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -1053,9 +1053,9 @@ xfs_buf_iodone_callbacks( (time_after(jiffies, (lasttime + 5*HZ)))) { lasttime = jiffies; prdev("XFS write error in file system meta-data " - "block 0x%Lx in %s", + "block 0x%llx in %s", XFS_BUF_TARGET(bp), - XFS_BUF_ADDR(bp), mp->m_fsname); + (__uint64_t)XFS_BUF_ADDR(bp), mp->m_fsname); } lasttarg = XFS_BUF_TARGET(bp); diff --git a/fs/xfs/xfs_da_btree.c b/fs/xfs/xfs_da_btree.c index 396556102f0d58013386408956798ebcba00f936..f0431b7e625316cc4b9c87c48dfe017135359c1d 100644 --- a/fs/xfs/xfs_da_btree.c +++ b/fs/xfs/xfs_da_btree.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2003 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -2166,9 +2166,9 @@ xfs_da_do_buf( cmn_err(CE_ALERT, "[%02d] br_startoff %lld br_startblock %lld br_blockcount %lld br_state %d\n", i, - mapp[i].br_startoff, - mapp[i].br_startblock, - mapp[i].br_blockcount, + (long long)mapp[i].br_startoff, + (long long)mapp[i].br_startblock, + (long long)mapp[i].br_blockcount, mapp[i].br_state); } }