Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f391a4ead61e4510ff385815ddaf3c0777fbad1b
Commit:     f391a4ead61e4510ff385815ddaf3c0777fbad1b
Parent:     bf126aee6d54fe1e509846abf3b27aba84c6d7ce
Author:     [EMAIL PROTECTED] <[EMAIL PROTECTED]>
AuthorDate: Wed Apr 25 21:08:02 2007 -0700
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Tue May 1 09:11:48 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
 fs/gfs2/dir.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fs/gfs2/dir.c b/fs/gfs2/dir.c
index 6c3ed76..a96fa07 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,
                        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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to