From c2dcb450d74db5ba70f349d33d91a2e3a6f589e2 Mon Sep 17 00:00:00 2001 From: "akpm@linux-foundation.org" Date: Wed, 25 Apr 2007 21:08:02 -0700 Subject: [PATCH] --- yaml --- r: 54478 b: refs/heads/master c: f391a4ead61e4510ff385815ddaf3c0777fbad1b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/gfs2/dir.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2fb9d05f6f08..567c277248bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf126aee6d54fe1e509846abf3b27aba84c6d7ce +refs/heads/master: f391a4ead61e4510ff385815ddaf3c0777fbad1b diff --git a/trunk/fs/gfs2/dir.c b/trunk/fs/gfs2/dir.c index 6c3ed7674a9f..a96fa07b3f3b 100644 --- a/trunk/fs/gfs2/dir.c +++ b/trunk/fs/gfs2/dir.c @@ -1319,9 +1319,11 @@ static int gfs2_dir_read_leaf(struct inode *inode, u64 *offset, void *opaque, if (IS_ERR(dent)) goto out_kfree; if (entries2 != g.offset) { - fs_warn(sdp, "Number of entries corrupt in dir leaf %llu, " - "entries2 (%u) != g.offset (%u)\n", - (u64)bh->b_blocknr, entries2, g.offset); + fs_warn(sdp, "Number of entries corrupt in dir " + "leaf %llu, entries2 (%u) != " + "g.offset (%u)\n", + (unsigned long long)bh->b_blocknr, + entries2, g.offset); error = -EIO; goto out_kfree; @@ -1454,7 +1456,8 @@ int gfs2_dir_read(struct inode *inode, u64 *offset, void *opaque, if (dip->i_di.di_entries != g.offset) { fs_warn(sdp, "Number of entries corrupt in dir %llu, " "ip->i_di.di_entries (%u) != g.offset (%u)\n", - dip->i_num.no_addr, dip->i_di.di_entries, + (unsigned long long)dip->i_num.no_addr, + dip->i_di.di_entries, g.offset); error = -EIO; goto out;