]> err.no Git - linux-2.6/commitdiff
[GFS2] printk warning fixes
authorakpm@linux-foundation.org <akpm@linux-foundation.org>
Thu, 26 Apr 2007 04:08:02 +0000 (21:08 -0700)
committerSteven Whitehouse <swhiteho@redhat.com>
Tue, 1 May 2007 08:11:48 +0000 (09:11 +0100)
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>
fs/gfs2/dir.c

index 6c3ed7674a9f8562b54103bed3186865097ea102..a96fa07b3f3bfdd382b0e41c565bfb26be71f82e 100644 (file)
@@ -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;