Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[GFS2] Casts for printing 64bit numbers

Browse source 
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
This commit is contained in:
Steven Whitehouse 2006-05-24 10:22:09 -04:00
parent 9229f01349
commit 382066da25
5 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/gfs2/glock.c
View file

@ -2196,7 +2196,8 @@ static int dump_inode(struct gfs2_inode *ip)
printk(KERN_INFO " Inode:\n"); printk(KERN_INFO " Inode:\n");
printk(KERN_INFO " num = %llu %llu\n", printk(KERN_INFO " num = %llu %llu\n",
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(KERN_INFO " type = %u\n", IF2DT(ip->i_di.di_mode)); printk(KERN_INFO " type = %u\n", IF2DT(ip->i_di.di_mode));
printk(KERN_INFO " i_count = %d\n", atomic_read(&ip->i_count)); printk(KERN_INFO " i_count = %d\n", atomic_read(&ip->i_count));
printk(KERN_INFO " i_flags ="); printk(KERN_INFO " i_flags =");
@ -2228,7 +2229,7 @@ static int dump_glock(struct gfs2_glock *gl)
spin_lock(&gl->gl_spin); spin_lock(&gl->gl_spin);
printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type, printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type,
gl->gl_name.ln_number); (unsigned long long)gl->gl_name.ln_number);
printk(KERN_INFO " gl_flags ="); printk(KERN_INFO " gl_flags =");
for (x = 0; x < 32; x++) for (x = 0; x < 32; x++)
if (test_bit(x, &gl->gl_flags)) if (test_bit(x, &gl->gl_flags))

7
fs/gfs2/meta_io.c
View file

@ -65,7 +65,7 @@ static void stuck_releasepage(struct buffer_head *bh)
fs_warn(sdp, "stuck in gfs2_releasepage() %p\n", inode); fs_warn(sdp, "stuck in gfs2_releasepage() %p\n", inode);
fs_warn(sdp, "blkno = %llu, bh->b_count = %d\n", fs_warn(sdp, "blkno = %llu, bh->b_count = %d\n",
(uint64_t)bh->b_blocknr, atomic_read(&bh->b_count)); (unsigned long long)bh->b_blocknr, atomic_read(&bh->b_count));
fs_warn(sdp, "pinned = %u\n", buffer_pinned(bh)); fs_warn(sdp, "pinned = %u\n", buffer_pinned(bh));
fs_warn(sdp, "bh->b_private = %s\n", (bd) ? "!NULL" : "NULL"); fs_warn(sdp, "bh->b_private = %s\n", (bd) ? "!NULL" : "NULL");
@ -75,7 +75,7 @@ static void stuck_releasepage(struct buffer_head *bh)
gl = bd->bd_gl; gl = bd->bd_gl;
fs_warn(sdp, "gl = (%u, %llu)\n", fs_warn(sdp, "gl = (%u, %llu)\n",
gl->gl_name.ln_type, gl->gl_name.ln_number); gl->gl_name.ln_type, (unsigned long long)gl->gl_name.ln_number);
fs_warn(sdp, "bd_list_tr = %s, bd_le.le_list = %s\n", fs_warn(sdp, "bd_list_tr = %s, bd_le.le_list = %s\n",
(list_empty(&bd->bd_list_tr)) ? "no" : "yes", (list_empty(&bd->bd_list_tr)) ? "no" : "yes",
@ -89,7 +89,8 @@ static void stuck_releasepage(struct buffer_head *bh)
return; return;
fs_warn(sdp, "ip = %llu %llu\n", fs_warn(sdp, "ip = %llu %llu\n",
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);
fs_warn(sdp, "ip->i_count = %d, ip->i_vnode = %s\n", fs_warn(sdp, "ip->i_count = %d, ip->i_vnode = %s\n",
atomic_read(&ip->i_count), atomic_read(&ip->i_count),
(ip->i_vnode) ? "!NULL" : "NULL"); (ip->i_vnode) ? "!NULL" : "NULL");

24
fs/gfs2/ondisk.c
View file

@ -50,8 +50,8 @@ void gfs2_inum_out(const struct gfs2_inum *no, char *buf)
static void gfs2_inum_print(struct gfs2_inum *no) static void gfs2_inum_print(struct gfs2_inum *no)
{ {
pv(no, no_formal_ino, "%llu"); printk(KERN_INFO " no_formal_ino = %llu\n", (unsigned long long)no->no_formal_ino);
pv(no, no_addr, "%llu"); printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr);
} }
static void gfs2_meta_header_in(struct gfs2_meta_header *mh, char *buf) static void gfs2_meta_header_in(struct gfs2_meta_header *mh, char *buf)
@ -111,10 +111,10 @@ void gfs2_rindex_in(struct gfs2_rindex *ri, char *buf)
void gfs2_rindex_print(struct gfs2_rindex *ri) void gfs2_rindex_print(struct gfs2_rindex *ri)
{ {
pv(ri, ri_addr, "%llu"); printk(KERN_INFO " ri_addr = %llu\n", (unsigned long long)ri->ri_addr);
pv(ri, ri_length, "%u"); pv(ri, ri_length, "%u");
pv(ri, ri_data0, "%llu"); printk(KERN_INFO " ri_data0 = %llu\n", (unsigned long long)ri->ri_data0);
pv(ri, ri_data, "%u"); pv(ri, ri_data, "%u");
pv(ri, ri_bitbytes, "%u"); pv(ri, ri_bitbytes, "%u");
@ -226,16 +226,16 @@ void gfs2_dinode_print(struct gfs2_dinode *di)
pv(di, di_uid, "%u"); pv(di, di_uid, "%u");
pv(di, di_gid, "%u"); pv(di, di_gid, "%u");
pv(di, di_nlink, "%u"); pv(di, di_nlink, "%u");
pv(di, di_size, "%llu"); printk(KERN_INFO " di_size = %llu\n", (unsigned long long)di->di_size);
pv(di, di_blocks, "%llu"); printk(KERN_INFO " di_blocks = %llu\n", (unsigned long long)di->di_blocks);
pv(di, di_atime, "%lld"); printk(KERN_INFO " di_atime = %lld\n", (long long)di->di_atime);
pv(di, di_mtime, "%lld"); printk(KERN_INFO " di_mtime = %lld\n", (long long)di->di_mtime);
pv(di, di_ctime, "%lld"); printk(KERN_INFO " di_ctime = %lld\n", (long long)di->di_ctime);
pv(di, di_major, "%u"); pv(di, di_major, "%u");
pv(di, di_minor, "%u"); pv(di, di_minor, "%u");
pv(di, di_goal_meta, "%llu"); printk(KERN_INFO " di_goal_meta = %llu\n", (unsigned long long)di->di_goal_meta);
pv(di, di_goal_data, "%llu"); printk(KERN_INFO " di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
pv(di, di_flags, "0x%.8X"); pv(di, di_flags, "0x%.8X");
pv(di, di_payload_format, "%u"); pv(di, di_payload_format, "%u");
@ -244,7 +244,7 @@ void gfs2_dinode_print(struct gfs2_dinode *di)
pv(di, di_depth, "%u"); pv(di, di_depth, "%u");
pv(di, di_entries, "%u"); pv(di, di_entries, "%u");
pv(di, di_eattr, "%llu"); printk(KERN_INFO " di_eattr = %llu\n", (unsigned long long)di->di_eattr);
} }
void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf) void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf)

4
fs/gfs2/rgrp.c
View file

@ -1165,7 +1165,7 @@ static struct gfs2_rgrpd *rgblk_free(struct gfs2_sbd *sdp, uint64_t bstart,
rgd = gfs2_blk2rgrpd(sdp, bstart); rgd = gfs2_blk2rgrpd(sdp, bstart);
if (!rgd) { if (!rgd) {
if (gfs2_consist(sdp)) if (gfs2_consist(sdp))
fs_err(sdp, "block = %llu\n", bstart); fs_err(sdp, "block = %llu\n", (unsigned long long)bstart);
return NULL; return NULL;
} }
@ -1452,7 +1452,7 @@ void gfs2_rlist_add(struct gfs2_sbd *sdp, struct gfs2_rgrp_list *rlist,
rgd = gfs2_blk2rgrpd(sdp, block); rgd = gfs2_blk2rgrpd(sdp, block);
if (!rgd) { if (!rgd) {
if (gfs2_consist(sdp)) if (gfs2_consist(sdp))
fs_err(sdp, "block = %llu\n", block); fs_err(sdp, "block = %llu\n", (unsigned long long)block);
return; return;
} }

11
fs/gfs2/util.c
View file

@ -116,7 +116,8 @@ int gfs2_consist_inode_i(struct gfs2_inode *ip, int cluster_wide,
"GFS2: fsid=%s: inode = %llu %llu\n" "GFS2: fsid=%s: inode = %llu %llu\n"
"GFS2: fsid=%s: function = %s, file = %s, line = %u\n", "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
sdp->sd_fsname, 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, file, line); sdp->sd_fsname, function, file, line);
return rv; return rv;
} }
@ -137,7 +138,7 @@ int gfs2_consist_rgrpd_i(struct gfs2_rgrpd *rgd, int cluster_wide,
"GFS2: fsid=%s: RG = %llu\n" "GFS2: fsid=%s: RG = %llu\n"
"GFS2: fsid=%s: function = %s, file = %s, line = %u\n", "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
sdp->sd_fsname, 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, file, line); sdp->sd_fsname, function, file, line);
return rv; return rv;
} }
@ -158,7 +159,7 @@ int gfs2_meta_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
"GFS2: fsid=%s: bh = %llu (%s)\n" "GFS2: fsid=%s: bh = %llu (%s)\n"
"GFS2: fsid=%s: function = %s, file = %s, line = %u\n", "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
sdp->sd_fsname, sdp->sd_fsname,
sdp->sd_fsname, (uint64_t)bh->b_blocknr, type, sdp->sd_fsname, (unsigned long long)bh->b_blocknr, type,
sdp->sd_fsname, function, file, line); sdp->sd_fsname, function, file, line);
return (me) ? -1 : -2; return (me) ? -1 : -2;
} }
@ -179,7 +180,7 @@ int gfs2_metatype_check_ii(struct gfs2_sbd *sdp, struct buffer_head *bh,
"GFS2: fsid=%s: bh = %llu (type: exp=%u, found=%u)\n" "GFS2: fsid=%s: bh = %llu (type: exp=%u, found=%u)\n"
"GFS2: fsid=%s: function = %s, file = %s, line = %u\n", "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
sdp->sd_fsname, sdp->sd_fsname,
sdp->sd_fsname, (uint64_t)bh->b_blocknr, type, t, sdp->sd_fsname, (unsigned long long)bh->b_blocknr, type, t,
sdp->sd_fsname, function, file, line); sdp->sd_fsname, function, file, line);
return (me) ? -1 : -2; return (me) ? -1 : -2;
} }
@ -217,7 +218,7 @@ int gfs2_io_error_bh_i(struct gfs2_sbd *sdp, struct buffer_head *bh,
"GFS2: fsid=%s: block = %llu\n" "GFS2: fsid=%s: block = %llu\n"
"GFS2: fsid=%s: function = %s, file = %s, line = %u\n", "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
sdp->sd_fsname, sdp->sd_fsname,
sdp->sd_fsname, (uint64_t)bh->b_blocknr, sdp->sd_fsname, (unsigned long long)bh->b_blocknr,
sdp->sd_fsname, function, file, line); sdp->sd_fsname, function, file, line);
return rv; return rv;
} }