Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=694... Commit: 69408051c88e056ebe8b224c00a5a17fe4a5a924 Parent: 57234ad3edfdb2334bd4a9dac58c46aabcb88a7e Author: Steven Whitehouse swhiteho@redhat.com AuthorDate: Wed Jul 29 16:34:36 2009 +0100 Committer: Steven Whitehouse swhiteho@redhat.com CommitterDate: Mon Oct 5 16:30:33 2009 +0100
gfs: Fix build warnings due to print formats
Signed-off-by: Steven Whitehouse swhiteho@redhat.com --- gfs-kernel/src/gfs/dio.c | 14 +++++----- gfs-kernel/src/gfs/gfs.h | 24 ------------------- gfs-kernel/src/gfs/gfs_ondisk.h | 48 +++++++++++++++++++------------------- gfs-kernel/src/gfs/glock.c | 9 ++++--- gfs-kernel/src/gfs/inode.c | 5 ++- gfs-kernel/src/gfs/ioctl.c | 20 ++++++++-------- gfs-kernel/src/gfs/log.c | 12 ++++++--- gfs-kernel/src/gfs/lops.c | 15 ++++++----- gfs-kernel/src/gfs/lvb.c | 6 ++-- gfs-kernel/src/gfs/recovery.c | 16 ++++++------ gfs-kernel/src/gfs/util.c | 32 +++++++++++++++---------- 11 files changed, 95 insertions(+), 106 deletions(-)
diff --git a/gfs-kernel/src/gfs/dio.c b/gfs-kernel/src/gfs/dio.c index 0d09023..56cb185 100644 --- a/gfs-kernel/src/gfs/dio.c +++ b/gfs-kernel/src/gfs/dio.c @@ -66,9 +66,9 @@ stuck_releasepage(struct buffer_head *bh) struct gfs_bufdata *bd = get_v2bd(bh);
printk("GFS: fsid=%s: stuck in gfs_releasepage()...\n", sdp->sd_fsname); - printk("GFS: fsid=%s: blkno = %"PRIu64", bh->b_count = %d\n", + printk("GFS: fsid=%s: blkno = %llu, bh->b_count = %d\n", sdp->sd_fsname, - (uint64_t)bh->b_blocknr, + (unsigned long long)bh->b_blocknr, atomic_read(&bh->b_count)); printk("GFS: fsid=%s: get_v2bd(bh) = %s\n", sdp->sd_fsname, @@ -77,10 +77,10 @@ stuck_releasepage(struct buffer_head *bh) if (bd) { struct gfs_glock *gl = bd->bd_gl;
- printk("GFS: fsid=%s: gl = (%u, %"PRIu64")\n", + printk("GFS: fsid=%s: gl = (%u, %llu)\n", sdp->sd_fsname, gl->gl_name.ln_type, - gl->gl_name.ln_number); + (unsigned long long)gl->gl_name.ln_number);
printk("GFS: fsid=%s: bd_new_le.le_trans = %s\n", sdp->sd_fsname, @@ -103,10 +103,10 @@ stuck_releasepage(struct buffer_head *bh) if (ip) { unsigned int x;
- printk("GFS: fsid=%s: ip = %"PRIu64"/%"PRIu64"\n", + printk("GFS: fsid=%s: ip = %llu/%llu\n", sdp->sd_fsname, - ip->i_num.no_formal_ino, - ip->i_num.no_addr); + (unsigned long long)ip->i_num.no_formal_ino, + (unsigned long long)ip->i_num.no_addr); printk("GFS: fsid=%s: ip->i_count = %d, ip->i_vnode = %s\n", sdp->sd_fsname, atomic_read(&ip->i_count), diff --git a/gfs-kernel/src/gfs/gfs.h b/gfs-kernel/src/gfs/gfs.h index 7cec09c..3229308 100644 --- a/gfs-kernel/src/gfs/gfs.h +++ b/gfs-kernel/src/gfs/gfs.h @@ -22,30 +22,6 @@ #define NO_CREATE (0) #define CREATE (1)
-#if (BITS_PER_LONG == 64) -#define PRIu64 "lu" -#define PRId64 "ld" -#define PRIo64 "lo" -#define PRIx64 "lx" -#define PRIX64 "lX" -#define SCNu64 "lu" -#define SCNd64 "ld" -#define SCNo64 "lo" -#define SCNx64 "lx" -#define SCNX64 "lX" -#else -#define PRIu64 "Lu" -#define PRId64 "Ld" -#define PRIo64 "Lo" -#define PRIx64 "Lx" -#define PRIX64 "LX" -#define SCNu64 "Lu" -#define SCNd64 "Ld" -#define SCNo64 "Lo" -#define SCNx64 "Lx" -#define SCNX64 "LX" -#endif - /* Divide num by den. Round up if there is a remainder. */ #define DIV_RU(num, den) (((num) + (den) - 1) / (den)) #define MAKE_MULT8(x) (((x) + 7) & ~7) diff --git a/gfs-kernel/src/gfs/gfs_ondisk.h b/gfs-kernel/src/gfs/gfs_ondisk.h index eea9038..11637c6 100644 --- a/gfs-kernel/src/gfs/gfs_ondisk.h +++ b/gfs-kernel/src/gfs/gfs_ondisk.h @@ -788,8 +788,8 @@ gfs_inum_out(struct gfs_inum *no, char *buf) void gfs_inum_print(struct gfs_inum *no) { - pv(no, no_formal_ino, "%"PRIu64); - pv(no, no_addr, "%"PRIu64); + pv(no, no_formal_ino, "%llu"); + pv(no, no_addr, "%llu"); }
/** @@ -847,7 +847,7 @@ gfs_meta_header_print(struct gfs_meta_header *mh) { pv(mh, mh_magic, "0x%.8X"); pv(mh, mh_type, "%u"); - pv(mh, mh_generation, "%"PRIu64); + pv(mh, mh_generation, "%llu"); pv(mh, mh_format, "%u"); pv(mh, mh_incarn, "%u"); } @@ -1001,7 +1001,7 @@ gfs_jindex_out(struct gfs_jindex *jindex, char *buf) void gfs_jindex_print(struct gfs_jindex *ji) { - pv(ji, ji_addr, "%"PRIu64); + pv(ji, ji_addr, "%llu"); pv(ji, ji_nsegment, "%u"); pv(ji, ji_pad, "%u");
@@ -1065,11 +1065,11 @@ gfs_rindex_out(struct gfs_rindex *grindex, char *buf) void gfs_rindex_print(struct gfs_rindex *ri) { - pv(ri, ri_addr, "%"PRIu64); + pv(ri, ri_addr, "%llu"); pv(ri, ri_length, "%u"); pv(ri, ri_pad, "%u");
- pv(ri, ri_data1, "%"PRIu64); + pv(ri, ri_data1, "%llu"); pv(ri, ri_data, "%u");
pv(ri, ri_bitbytes, "%u"); @@ -1205,9 +1205,9 @@ gfs_quota_out(struct gfs_quota *quota, char *buf) void gfs_quota_print(struct gfs_quota *quota) { - pv(quota, qu_limit, "%"PRIu64); - pv(quota, qu_warn, "%"PRIu64); - pv(quota, qu_value, "%"PRId64); + pv(quota, qu_limit, "%llu"); + pv(quota, qu_warn, "%llu"); + pv(quota, qu_value, "%llu");
pa(quota, qu_reserved, 64); } @@ -1327,16 +1327,16 @@ gfs_dinode_print(struct gfs_dinode *di) pv(di, di_uid, "%u"); pv(di, di_gid, "%u"); pv(di, di_nlink, "%u"); - pv(di, di_size, "%"PRIu64); - pv(di, di_blocks, "%"PRIu64); - pv(di, di_atime, "%"PRId64); - pv(di, di_mtime, "%"PRId64); - pv(di, di_ctime, "%"PRId64); + pv(di, di_size, "%llu"); + pv(di, di_blocks, "%llu"); + pv(di, di_atime, "%lld"); + pv(di, di_mtime, "%llu"); + pv(di, di_ctime, "%llu"); pv(di, di_major, "%u"); pv(di, di_minor, "%u");
- pv(di, di_rgrp, "%"PRIu64); - pv(di, di_goal_rgrp, "%"PRIu64); + pv(di, di_rgrp, "%llu"); + pv(di, di_goal_rgrp, "%llu"); pv(di, di_goal_dblk, "%u"); pv(di, di_goal_mblk, "%u"); pv(di, di_flags, "0x%.8X"); @@ -1351,7 +1351,7 @@ gfs_dinode_print(struct gfs_dinode *di)
gfs_inum_print(&di->di_next_unused);
- pv(di, di_eattr, "%"PRIu64); + pv(di, di_eattr, "%llu");
pa(di, di_reserved, 56); } @@ -1529,7 +1529,7 @@ gfs_leaf_print(struct gfs_leaf *lf) pv(lf, lf_depth, "%u"); pv(lf, lf_entries, "%u"); pv(lf, lf_dirent_format, "%u"); - pv(lf, lf_next, "%"PRIu64); + pv(lf, lf_next, "%llu");
pa(lf, lf_reserved, 64); } @@ -1600,11 +1600,11 @@ gfs_log_header_print(struct gfs_log_header *lh) pv(lh, lh_flags, "0x%.8X"); pv(lh, lh_pad, "%u");
- pv(lh, lh_first, "%"PRIu64); - pv(lh, lh_sequence, "%"PRIu64); + pv(lh, lh_first, "%llu"); + pv(lh, lh_sequence, "%llu");
- pv(lh, lh_tail, "%"PRIu64); - pv(lh, lh_last_dump, "%"PRIu64); + pv(lh, lh_tail, "%llu"); + pv(lh, lh_last_dump, "%llu");
pa(lh, lh_reserved, 64); } @@ -1715,7 +1715,7 @@ gfs_block_tag_out(struct gfs_block_tag *tag, char *buf) void gfs_block_tag_print(struct gfs_block_tag *tag) { - pv(tag, bt_blkno, "%"PRIu64); + pv(tag, bt_blkno, "%llu"); pv(tag, bt_flags, "%u"); pv(tag, bt_pad, "%u"); } @@ -1763,7 +1763,7 @@ gfs_quota_tag_out(struct gfs_quota_tag *tag, char *buf) void gfs_quota_tag_print(struct gfs_quota_tag *tag) { - pv(tag, qt_change, "%"PRId64); + pv(tag, qt_change, "%llu"); pv(tag, qt_flags, "0x%.8X"); pv(tag, qt_id, "%u"); } diff --git a/gfs-kernel/src/gfs/glock.c b/gfs-kernel/src/gfs/glock.c index 57a829d..3040c60 100644 --- a/gfs-kernel/src/gfs/glock.c +++ b/gfs-kernel/src/gfs/glock.c @@ -2806,8 +2806,9 @@ dump_inode(struct gfs_inode *ip, int error = -ENOBUFS;
gfs_printf(" Inode:\n"); - gfs_printf(" num = %" PRIu64 "/%" PRIu64 "\n", - ip->i_num.no_formal_ino, ip->i_num.no_addr); + gfs_printf(" num = %llu/%llu\n", + (unsigned long long)ip->i_num.no_formal_ino, + (unsigned long long)ip->i_num.no_addr); gfs_printf(" type = %u\n", ip->i_di.di_type); gfs_printf(" i_count = %d\n", atomic_read(&ip->i_count)); gfs_printf(" i_flags ="); @@ -2844,9 +2845,9 @@ dump_glock(struct gfs_glock *gl,
spin_lock(&gl->gl_spin);
- gfs_printf("Glock (%u, %" PRIu64 ")\n", + gfs_printf("Glock (%u, %llu)\n", gl->gl_name.ln_type, - gl->gl_name.ln_number); + (unsigned long long)gl->gl_name.ln_number); gfs_printf(" gl_flags ="); for (x = 0; x < 32; x++) if (test_bit(x, &gl->gl_flags)) diff --git a/gfs-kernel/src/gfs/inode.c b/gfs-kernel/src/gfs/inode.c index 1e3684a..68c94e6 100644 --- a/gfs-kernel/src/gfs/inode.c +++ b/gfs-kernel/src/gfs/inode.c @@ -1173,8 +1173,9 @@ make_dinode(struct gfs_inode *dip, rgd = gfs_blk2rgrpd(sdp, inum->no_addr); if (!rgd) { if (gfs_consist(sdp)) - printk("GFS: fsid=%s: block = %"PRIu64"\n", - sdp->sd_fsname, inum->no_addr); + printk("GFS: fsid=%s: block = %llu\n", + sdp->sd_fsname, + (unsigned long long)inum->no_addr); brelse(dibh); return -EIO; } diff --git a/gfs-kernel/src/gfs/ioctl.c b/gfs-kernel/src/gfs/ioctl.c index b875b4a..afc08f0 100644 --- a/gfs-kernel/src/gfs/ioctl.c +++ b/gfs-kernel/src/gfs/ioctl.c @@ -273,12 +273,12 @@ gi_get_stat_gfs(struct gfs_inode *ip,
gfs_printf("version 0\n"); gfs_printf("bsize %u\n", ip->i_sbd->sd_sb.sb_bsize); - gfs_printf("total_blocks %"PRIu64"\n", sg.sg_total_blocks); - gfs_printf("free %"PRIu64"\n", sg.sg_free); - gfs_printf("used_dinode %"PRIu64"\n", sg.sg_used_dinode); - gfs_printf("free_dinode %"PRIu64"\n", sg.sg_free_dinode); - gfs_printf("used_meta %"PRIu64"\n", sg.sg_used_meta); - gfs_printf("free_meta %"PRIu64"\n", sg.sg_free_meta); + gfs_printf("total_blocks %llu\n", (unsigned long long)sg.sg_total_blocks); + gfs_printf("free %llu\n", (unsigned long long)sg.sg_free); + gfs_printf("used_dinode %llu\n", (unsigned long long)sg.sg_used_dinode); + gfs_printf("free_dinode %llu\n", (unsigned long long)sg.sg_free_dinode); + gfs_printf("used_meta %llu\n", (unsigned long long)sg.sg_used_meta); + gfs_printf("free_meta %llu\n", (unsigned long long)sg.sg_free_meta);
error = 0;
@@ -357,8 +357,8 @@ gi_get_counters(struct gfs_inode *ip, atomic_read(&sdp->sd_depend_count)); gfs_printf("sd_reclaim_count:glocks on reclaim list::%d\n", atomic_read(&sdp->sd_reclaim_count)); - gfs_printf("sd_log_wrap:log wraps::%"PRIu64"\n", - sdp->sd_log_wrap); + gfs_printf("sd_log_wrap:log wraps::%llu\n", + (unsigned long long)sdp->sd_log_wrap); gfs_printf("sd_lm_outstanding:outstanding LM calls::%d\n", atomic_read(&sdp->sd_lm_outstanding)); gfs_printf("sd_bio_outstanding:outstanding BIO calls::%u\n", @@ -804,8 +804,8 @@ gi_do_reclaim(struct gfs_inode *ip, error = -ENOBUFS;
gfs_printf("version 0\n"); - gfs_printf("inodes %"PRIu64"\n", inodes); - gfs_printf("metadata %"PRIu64"\n", metadata); + gfs_printf("inodes %llu\n", (unsigned long long)inodes); + gfs_printf("metadata %llu\n", (unsigned long long)metadata);
error = 0;
diff --git a/gfs-kernel/src/gfs/log.c b/gfs-kernel/src/gfs/log.c index 21b0404..f8f2f6c 100644 --- a/gfs-kernel/src/gfs/log.c +++ b/gfs-kernel/src/gfs/log.c @@ -551,10 +551,14 @@ check_seg_usage(struct gfs_sbd *sdp, struct gfs_trans *tr)
default: gfs_assert(sdp, FALSE, - printk("GFS: fsid=%s: head_off = %"PRIu64", head_wrap = %"PRIu64"\n" - "GFS: fsid=%s: dump_off = %"PRIu64", dump_wrap = %"PRIu64"\n", - sdp->sd_fsname, head_off, head_wrap, - sdp->sd_fsname, dump_off, dump_wrap);); + printk("GFS: fsid=%s: head_off = %llu, head_wrap = %llu\n" + "GFS: fsid=%s: dump_off = %llu, dump_wrap = %llu\n", + sdp->sd_fsname, + (unsigned long long)head_off, + (unsigned long long)head_wrap, + sdp->sd_fsname, + (unsigned long long)dump_off, + (unsigned long long)dump_wrap);); break; } } diff --git a/gfs-kernel/src/gfs/lops.c b/gfs-kernel/src/gfs/lops.c index 6010444..70f2a32 100644 --- a/gfs-kernel/src/gfs/lops.c +++ b/gfs-kernel/src/gfs/lops.c @@ -85,9 +85,9 @@ glock_print(struct gfs_sbd *sdp, struct gfs_log_element *le, unsigned int where) return; }
- printk(" Glock: (%u, %"PRIu64")\n", + printk(" Glock: (%u, %llu)\n", gl->gl_name.ln_type, - gl->gl_name.ln_number); + (unsigned long long)gl->gl_name.ln_number); }
/** @@ -222,7 +222,7 @@ buf_print(struct gfs_sbd *sdp, struct gfs_log_element *le, unsigned int where) return; }
- printk(" Buffer: %"PRIu64"\n", (uint64_t)bd->bd_bh->b_blocknr); + printk(" Buffer: %llu\n", (unsigned long long)bd->bd_bh->b_blocknr); }
/** @@ -726,8 +726,9 @@ unlinked_print(struct gfs_sbd *sdp, struct gfs_log_element *le, return; }
- printk(" unlinked: %"PRIu64"/%"PRIu64", %s\n", - ul->ul_inum.no_formal_ino, ul->ul_inum.no_addr, + printk(" unlinked: %llu/%llu, %s\n", + (unsigned long long)ul->ul_inum.no_formal_ino, + (unsigned long long)ul->ul_inum.no_addr, type); }
@@ -1172,9 +1173,9 @@ quota_print(struct gfs_sbd *sdp, struct gfs_log_element *le, unsigned int where) struct gfs_quota_le *ql;
ql = container_of(le, struct gfs_quota_le, ql_le); - printk(" quota: %s %u: %"PRId64" blocks\n", + printk(" quota: %s %u: %lld blocks\n", (test_bit(QDF_USER, &ql->ql_data->qd_flags)) ? "user" : "group", - ql->ql_data->qd_id, ql->ql_change); + ql->ql_data->qd_id, (long long)ql->ql_change); }
/** diff --git a/gfs-kernel/src/gfs/lvb.c b/gfs-kernel/src/gfs/lvb.c index 41fc26f..8e7d75d 100644 --- a/gfs-kernel/src/gfs/lvb.c +++ b/gfs-kernel/src/gfs/lvb.c @@ -129,7 +129,7 @@ gfs_quota_lvb_print(struct gfs_quota_lvb *qb) { pv(qb, qb_magic, "%u"); pv(qb, qb_pad, "%u"); - pv(qb, qb_limit, "%"PRIu64); - pv(qb, qb_warn, "%"PRIu64); - pv(qb, qb_value, "%"PRId64); + pv(qb, qb_limit, "%llu"); + pv(qb, qb_warn, "%llu"); + pv(qb, qb_value, "%lld"); } diff --git a/gfs-kernel/src/gfs/recovery.c b/gfs-kernel/src/gfs/recovery.c index ba5f34d..d014272 100644 --- a/gfs-kernel/src/gfs/recovery.c +++ b/gfs-kernel/src/gfs/recovery.c @@ -311,14 +311,14 @@ gfs_increment_blkno(struct gfs_sbd *sdp, struct gfs_jindex *jdesc,
if (error) { /* Corrupt headers here are bad */ if (gfs_consist(sdp)) - printk("GFS: fsid=%s: *addr = %"PRIu64"\n", - sdp->sd_fsname, *addr); + printk("GFS: fsid=%s: *addr = %llu\n", + sdp->sd_fsname, (unsigned long long)*addr); return -EIO; } if (header.lh_first == *addr) { if (gfs_consist(sdp)) - printk("GFS: fsid=%s: *addr = %"PRIu64"\n", - sdp->sd_fsname, *addr); + printk("GFS: fsid=%s: *addr = %llu\n", + sdp->sd_fsname, (unsigned long long)*addr); gfs_log_header_print(&header); return -EIO; } @@ -367,14 +367,14 @@ foreach_descriptor(struct gfs_sbd *sdp, struct gfs_jindex *jdesc,
if (error) { /* Corrupt headers here are bad */ if (gfs_consist(sdp)) - printk("GFS: fsid=%s: start = %"PRIu64"\n", - sdp->sd_fsname, start); + printk("GFS: fsid=%s: start = %llu\n", + sdp->sd_fsname, (unsigned long long)start); return -EIO; } if (header.lh_first != start) { if (gfs_consist(sdp)) - printk("GFS: fsid=%s: start = %"PRIu64"\n", - sdp->sd_fsname, start); + printk("GFS: fsid=%s: start = %llu\n", + sdp->sd_fsname, (unsigned long long)start); gfs_log_header_print(&header); return -EIO; } diff --git a/gfs-kernel/src/gfs/util.c b/gfs-kernel/src/gfs/util.c index 7d1c0e4..0367424 100644 --- a/gfs-kernel/src/gfs/util.c +++ b/gfs-kernel/src/gfs/util.c @@ -327,12 +327,14 @@ gfs_consist_inode_i(struct gfs_inode *ip, int cluster_wide, struct gfs_sbd *sdp = ip->i_sbd; return gfs_lm_withdraw(sdp, "GFS: fsid=%s: fatal: filesystem consistency error\n" - "GFS: fsid=%s: inode = %"PRIu64"/%"PRIu64"\n" + "GFS: fsid=%s: inode = %llu/%llu\n" "GFS: fsid=%s: function = %s\n" "GFS: fsid=%s: file = %s, line = %u\n" "GFS: fsid=%s: time = %lu\n", sdp->sd_fsname, - sdp->sd_fsname, ip->i_num.no_formal_ino, ip->i_num.no_addr, + sdp->sd_fsname, + (unsigned long long)ip->i_num.no_formal_ino, + (unsigned long long)ip->i_num.no_addr, sdp->sd_fsname, function, sdp->sd_fsname, file, line, sdp->sd_fsname, get_seconds()); @@ -358,12 +360,13 @@ gfs_consist_rgrpd_i(struct gfs_rgrpd *rgd, int cluster_wide, struct gfs_sbd *sdp = rgd->rd_sbd; return gfs_lm_withdraw(sdp, "GFS: fsid=%s: fatal: filesystem consistency error\n" - "GFS: fsid=%s: RG = %"PRIu64"\n" + "GFS: fsid=%s: RG = %llu\n" "GFS: fsid=%s: function = %s\n" "GFS: fsid=%s: file = %s, line = %u\n" "GFS: fsid=%s: time = %lu\n", sdp->sd_fsname, - sdp->sd_fsname, rgd->rd_ri.ri_addr, + sdp->sd_fsname, + (unsigned long long)rgd->rd_ri.ri_addr, sdp->sd_fsname, function, sdp->sd_fsname, file, line, sdp->sd_fsname, get_seconds()); @@ -389,12 +392,12 @@ gfs_meta_check_ii(struct gfs_sbd *sdp, struct buffer_head *bh, int me; me = gfs_lm_withdraw(sdp, "GFS: fsid=%s: fatal: invalid metadata block\n" - "GFS: fsid=%s: bh = %"PRIu64" (magic)\n" + "GFS: fsid=%s: bh = %llu (magic)\n" "GFS: fsid=%s: function = %s\n" "GFS: fsid=%s: file = %s, line = %u\n" "GFS: fsid=%s: time = %lu\n", sdp->sd_fsname, - sdp->sd_fsname, (uint64_t)bh->b_blocknr, + sdp->sd_fsname, (unsigned long long)bh->b_blocknr, sdp->sd_fsname, function, sdp->sd_fsname, file, line, sdp->sd_fsname, get_seconds()); @@ -424,13 +427,13 @@ gfs_metatype_check_ii(struct gfs_sbd *sdp, struct buffer_head *bh, int me; me = gfs_lm_withdraw(sdp, "GFS: fsid=%s: fatal: invalid metadata block\n" - "GFS: fsid=%s: bh = %"PRIu64" (type: exp=%u, found=%u)\n" + "GFS: fsid=%s: bh = %llu (type: exp=%u, found=%u)\n" "GFS: fsid=%s: function = %s\n" "GFS: fsid=%s: file = %s, line = %u\n" "GFS: fsid=%s: time = %lu\n", sdp->sd_fsname, - sdp->sd_fsname, (uint64_t)bh->b_blocknr, type, t, - sdp->sd_fsname, function, + sdp->sd_fsname, (unsigned long long)bh->b_blocknr, + type, t, sdp->sd_fsname, function, sdp->sd_fsname, file, line, sdp->sd_fsname, get_seconds()); return (me) ? -1 : -2; @@ -482,12 +485,14 @@ gfs_io_error_inode_i(struct gfs_inode *ip, struct gfs_sbd *sdp = ip->i_sbd; return gfs_lm_withdraw(sdp, "GFS: fsid=%s: fatal: I/O error\n" - "GFS: fsid=%s: inode = %"PRIu64"/%"PRIu64"\n" + "GFS: fsid=%s: inode = %llu/%llu\n" "GFS: fsid=%s: function = %s\n" "GFS: fsid=%s: file = %s, line = %u\n" "GFS: fsid=%s: time = %lu\n", sdp->sd_fsname, - sdp->sd_fsname, ip->i_num.no_formal_ino, ip->i_num.no_addr, + sdp->sd_fsname, + (unsigned long long)ip->i_num.no_formal_ino, + (unsigned long long)ip->i_num.no_addr, sdp->sd_fsname, function, sdp->sd_fsname, file, line, sdp->sd_fsname, get_seconds()); @@ -512,12 +517,13 @@ gfs_io_error_bh_i(struct gfs_sbd *sdp, struct buffer_head *bh, { return gfs_lm_withdraw(sdp, "GFS: fsid=%s: fatal: I/O error\n" - "GFS: fsid=%s: block = %"PRIu64"\n" + "GFS: fsid=%s: block = %llu\n" "GFS: fsid=%s: function = %s\n" "GFS: fsid=%s: file = %s, line = %u\n" "GFS: fsid=%s: time = %lu\n", sdp->sd_fsname, - sdp->sd_fsname, (uint64_t)bh->b_blocknr, + sdp->sd_fsname, + (unsigned long long)bh->b_blocknr, sdp->sd_fsname, function, sdp->sd_fsname, file, line, sdp->sd_fsname, get_seconds());
cluster-commits@lists.fedorahosted.org
-
Steven Whitehouse