aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakpm@linux-foundation.org <akpm@linux-foundation.org>2007-04-26 00:08:02 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2007-05-01 04:11:48 -0400
commitf391a4ead61e4510ff385815ddaf3c0777fbad1b (patch)
treedaa54243c295d3916462410e32507c889585a857
parentbf126aee6d54fe1e509846abf3b27aba84c6d7ce (diff)
[GFS2] printk warning fixes
alpha: fs/gfs2/dir.c: In function 'gfs2_dir_read_leaf': fs/gfs2/dir.c:1322: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type 'sector_t' fs/gfs2/dir.c: In function 'gfs2_dir_read': fs/gfs2/dir.c:1455: warning: format '%llu' expects type 'long long unsigned int', but argument 3 has type '__u64' Cc: Steven Whitehouse <swhiteho@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
-rw-r--r--fs/gfs2/dir.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 6c3ed7674a9f..a96fa07b3f3b 100644
--- a/fs/gfs2/dir.c
+++ b/fs/gfs2/dir.c
@@ -1319,9 +1319,11 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque,
1319 if (IS_ERR(dent)) 1319 if (IS_ERR(dent))
1320 goto out_kfree; 1320 goto out_kfree;
1321 if (entries2 != g.offset) { 1321 if (entries2 != g.offset) {
1322 fs_warn(sdp, "Number of entries corrupt in dir leaf %llu, " 1322 fs_warn(sdp, "Number of entries corrupt in dir "
1323 "entries2 (%u) != g.offset (%u)\n", 1323 "leaf %llu, entries2 (%u) != "
1324 (u64)bh->b_blocknr, entries2, g.offset); 1324 "g.offset (%u)\n",
1325 (unsigned long long)bh->b_blocknr,
1326 entries2, g.offset);
1325 1327
1326 error = -EIO; 1328 error = -EIO;
1327 goto out_kfree; 1329 goto out_kfree;
@@ -1454,7 +1456,8 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque,
1454 if (dip->i_di.di_entries != g.offset) { 1456 if (dip->i_di.di_entries != g.offset) {
1455 fs_warn(sdp, "Number of entries corrupt in dir %llu, " 1457 fs_warn(sdp, "Number of entries corrupt in dir %llu, "
1456 "ip->i_di.di_entries (%u) != g.offset (%u)\n", 1458 "ip->i_di.di_entries (%u) != g.offset (%u)\n",
1457 dip->i_num.no_addr, dip->i_di.di_entries, 1459 (unsigned long long)dip->i_num.no_addr,
1460 dip->i_di.di_entries,
1458 g.offset); 1461 g.offset);
1459 error = -EIO; 1462 error = -EIO;
1460 goto out; 1463 goto out;