Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 382066da251132f768380f4852ed5afb72d88f80

Authored by Steven Whitehouse
1 parent 9229f01349
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[GFS2] Casts for printing 64bit numbers 

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

Showing 5 changed files with 27 additions and 24 deletions Side-by-side Diff

... ... @@ -2196,7 +2196,8 @@
2196 2196  
2197 2197 printk(KERN_INFO " Inode:\n");
2198 2198 printk(KERN_INFO " num = %llu %llu\n",
2199   - ip->i_num.no_formal_ino, ip->i_num.no_addr);
  2199 + (unsigned long long)ip->i_num.no_formal_ino,
  2200 + (unsigned long long)ip->i_num.no_addr);
2200 2201 printk(KERN_INFO " type = %u\n", IF2DT(ip->i_di.di_mode));
2201 2202 printk(KERN_INFO " i_count = %d\n", atomic_read(&ip->i_count));
2202 2203 printk(KERN_INFO " i_flags =");
... ... @@ -2228,7 +2229,7 @@
2228 2229 spin_lock(&gl->gl_spin);
2229 2230  
2230 2231 printk(KERN_INFO "Glock (%u, %llu)\n", gl->gl_name.ln_type,
2231   - gl->gl_name.ln_number);
  2232 + (unsigned long long)gl->gl_name.ln_number);
2232 2233 printk(KERN_INFO " gl_flags =");
2233 2234 for (x = 0; x < 32; x++)
2234 2235 if (test_bit(x, &gl->gl_flags))
... ... @@ -65,7 +65,7 @@
65 65  
66 66 fs_warn(sdp, "stuck in gfs2_releasepage() %p\n", inode);
67 67 fs_warn(sdp, "blkno = %llu, bh->b_count = %d\n",
68   - (uint64_t)bh->b_blocknr, atomic_read(&bh->b_count));
  68 + (unsigned long long)bh->b_blocknr, atomic_read(&bh->b_count));
69 69 fs_warn(sdp, "pinned = %u\n", buffer_pinned(bh));
70 70 fs_warn(sdp, "bh->b_private = %s\n", (bd) ? "!NULL" : "NULL");
71 71  
... ... @@ -75,7 +75,7 @@
75 75 gl = bd->bd_gl;
76 76  
77 77 fs_warn(sdp, "gl = (%u, %llu)\n",
78   - gl->gl_name.ln_type, gl->gl_name.ln_number);
  78 + gl->gl_name.ln_type, (unsigned long long)gl->gl_name.ln_number);
79 79  
80 80 fs_warn(sdp, "bd_list_tr = %s, bd_le.le_list = %s\n",
81 81 (list_empty(&bd->bd_list_tr)) ? "no" : "yes",
... ... @@ -89,7 +89,8 @@
89 89 return;
90 90  
91 91 fs_warn(sdp, "ip = %llu %llu\n",
92   - ip->i_num.no_formal_ino, ip->i_num.no_addr);
  92 + (unsigned long long)ip->i_num.no_formal_ino,
  93 + (unsigned long long)ip->i_num.no_addr);
93 94 fs_warn(sdp, "ip->i_count = %d, ip->i_vnode = %s\n",
94 95 atomic_read(&ip->i_count),
95 96 (ip->i_vnode) ? "!NULL" : "NULL");
... ... @@ -50,8 +50,8 @@
50 50  
51 51 static void gfs2_inum_print(struct gfs2_inum *no)
52 52 {
53   - pv(no, no_formal_ino, "%llu");
54   - pv(no, no_addr, "%llu");
  53 + printk(KERN_INFO " no_formal_ino = %llu\n", (unsigned long long)no->no_formal_ino);
  54 + printk(KERN_INFO " no_addr = %llu\n", (unsigned long long)no->no_addr);
55 55 }
56 56  
57 57 static void gfs2_meta_header_in(struct gfs2_meta_header *mh, char *buf)
58 58  
... ... @@ -111,10 +111,10 @@
111 111  
112 112 void gfs2_rindex_print(struct gfs2_rindex *ri)
113 113 {
114   - pv(ri, ri_addr, "%llu");
  114 + printk(KERN_INFO " ri_addr = %llu\n", (unsigned long long)ri->ri_addr);
115 115 pv(ri, ri_length, "%u");
116 116  
117   - pv(ri, ri_data0, "%llu");
  117 + printk(KERN_INFO " ri_data0 = %llu\n", (unsigned long long)ri->ri_data0);
118 118 pv(ri, ri_data, "%u");
119 119  
120 120 pv(ri, ri_bitbytes, "%u");
121 121  
... ... @@ -226,16 +226,16 @@
226 226 pv(di, di_uid, "%u");
227 227 pv(di, di_gid, "%u");
228 228 pv(di, di_nlink, "%u");
229   - pv(di, di_size, "%llu");
230   - pv(di, di_blocks, "%llu");
231   - pv(di, di_atime, "%lld");
232   - pv(di, di_mtime, "%lld");
233   - pv(di, di_ctime, "%lld");
  229 + printk(KERN_INFO " di_size = %llu\n", (unsigned long long)di->di_size);
  230 + printk(KERN_INFO " di_blocks = %llu\n", (unsigned long long)di->di_blocks);
  231 + printk(KERN_INFO " di_atime = %lld\n", (long long)di->di_atime);
  232 + printk(KERN_INFO " di_mtime = %lld\n", (long long)di->di_mtime);
  233 + printk(KERN_INFO " di_ctime = %lld\n", (long long)di->di_ctime);
234 234 pv(di, di_major, "%u");
235 235 pv(di, di_minor, "%u");
236 236  
237   - pv(di, di_goal_meta, "%llu");
238   - pv(di, di_goal_data, "%llu");
  237 + printk(KERN_INFO " di_goal_meta = %llu\n", (unsigned long long)di->di_goal_meta);
  238 + printk(KERN_INFO " di_goal_data = %llu\n", (unsigned long long)di->di_goal_data);
239 239  
240 240 pv(di, di_flags, "0x%.8X");
241 241 pv(di, di_payload_format, "%u");
... ... @@ -244,7 +244,7 @@
244 244 pv(di, di_depth, "%u");
245 245 pv(di, di_entries, "%u");
246 246  
247   - pv(di, di_eattr, "%llu");
  247 + printk(KERN_INFO " di_eattr = %llu\n", (unsigned long long)di->di_eattr);
248 248 }
249 249  
250 250 void gfs2_log_header_in(struct gfs2_log_header *lh, char *buf)
... ... @@ -1165,7 +1165,7 @@
1165 1165 rgd = gfs2_blk2rgrpd(sdp, bstart);
1166 1166 if (!rgd) {
1167 1167 if (gfs2_consist(sdp))
1168   - fs_err(sdp, "block = %llu\n", bstart);
  1168 + fs_err(sdp, "block = %llu\n", (unsigned long long)bstart);
1169 1169 return NULL;
1170 1170 }
1171 1171  
... ... @@ -1452,7 +1452,7 @@
1452 1452 rgd = gfs2_blk2rgrpd(sdp, block);
1453 1453 if (!rgd) {
1454 1454 if (gfs2_consist(sdp))
1455   - fs_err(sdp, "block = %llu\n", block);
  1455 + fs_err(sdp, "block = %llu\n", (unsigned long long)block);
1456 1456 return;
1457 1457 }
1458 1458  
... ... @@ -116,7 +116,8 @@
116 116 "GFS2: fsid=%s: inode = %llu %llu\n"
117 117 "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
118 118 sdp->sd_fsname,
119   - sdp->sd_fsname, ip->i_num.no_formal_ino, ip->i_num.no_addr,
  119 + sdp->sd_fsname, (unsigned long long)ip->i_num.no_formal_ino,
  120 + (unsigned long long)ip->i_num.no_addr,
120 121 sdp->sd_fsname, function, file, line);
121 122 return rv;
122 123 }
... ... @@ -137,7 +138,7 @@
137 138 "GFS2: fsid=%s: RG = %llu\n"
138 139 "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
139 140 sdp->sd_fsname,
140   - sdp->sd_fsname, rgd->rd_ri.ri_addr,
  141 + sdp->sd_fsname, (unsigned long long)rgd->rd_ri.ri_addr,
141 142 sdp->sd_fsname, function, file, line);
142 143 return rv;
143 144 }
... ... @@ -158,7 +159,7 @@
158 159 "GFS2: fsid=%s: bh = %llu (%s)\n"
159 160 "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
160 161 sdp->sd_fsname,
161   - sdp->sd_fsname, (uint64_t)bh->b_blocknr, type,
  162 + sdp->sd_fsname, (unsigned long long)bh->b_blocknr, type,
162 163 sdp->sd_fsname, function, file, line);
163 164 return (me) ? -1 : -2;
164 165 }
... ... @@ -179,7 +180,7 @@
179 180 "GFS2: fsid=%s: bh = %llu (type: exp=%u, found=%u)\n"
180 181 "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
181 182 sdp->sd_fsname,
182   - sdp->sd_fsname, (uint64_t)bh->b_blocknr, type, t,
  183 + sdp->sd_fsname, (unsigned long long)bh->b_blocknr, type, t,
183 184 sdp->sd_fsname, function, file, line);
184 185 return (me) ? -1 : -2;
185 186 }
... ... @@ -217,7 +218,7 @@
217 218 "GFS2: fsid=%s: block = %llu\n"
218 219 "GFS2: fsid=%s: function = %s, file = %s, line = %u\n",
219 220 sdp->sd_fsname,
220   - sdp->sd_fsname, (uint64_t)bh->b_blocknr,
  221 + sdp->sd_fsname, (unsigned long long)bh->b_blocknr,
221 222 sdp->sd_fsname, function, file, line);
222 223 return rv;
223 224 }