Attachment 154454 Details for Bug 232107 – Second part of patch

[patch] Second part of patch

dir-corrupt-2.diff (text/plain), 1.86 KB, created by Steve Whitehouse on 2007-05-10 09:21:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Whitehouse

Created: 2007-05-10 09:21:20 UTC

Size: 1.86 KB

patch

obsolete

>From: akpm@linux-foundation.org <akpm@linux-foundation.org>
>Date: Thu, 26 Apr 2007 04:08:02 +0000 (-0700)
>Subject: [GFS2] printk warning fixes
>X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=f391a4ead61e4510ff385815ddaf3c0777fbad1b
>
>[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>
>---
>
>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;

Actions: View | Diff

Attachments on bug 232107: 150028 | 154453 | 154454