[PATCH] mm snapshot broken-out-2007-11-06-02-32 - conflict in vxfs_iget ()

[PATCH] mm snapshot broken-out-2007-11-06-02-32 - conflict in vxfs_iget ()

[Kamalesh Babulal]

Hi Andrew,

The kernel build fails on S390, with error 

 CC [M]  fs/freevxfs/vxfs_inode.o
fs/freevxfs/vxfs_inode.c:298: error: conflicting types for 'vxfs_iget'
fs/freevxfs/vxfs_extern.h:61: error: previous declaration of 'vxfs_iget' was here
fs/freevxfs/vxfs_inode.c:298: error: conflicting types for 'vxfs_iget'
fs/freevxfs/vxfs_extern.h:61: error: previous declaration of 'vxfs_iget' was here
make[2]: *** [fs/freevxfs/vxfs_inode.o] Error 1
make[1]: *** [fs/freevxfs] Error 2
make: *** [fs] Error 2

This error is caused by iget-stop-freevxfs-from-using-iget-and-read_inode.patch,
where the function proto type is declared as 
vxfs_iget(struct super_block *, unsigned long) and defined as 
vxfs_iget(struct super_block *sbp, ino_t ino)

This patch has been tested for the buid failure.

Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
--- linux-2.6.24-rc1/fs/freevxfs/vxfs_extern.h	2007-11-06 17:04:04.000000000 +0530
+++ linux-2.6.24-rc1/fs/freevxfs/~vxfs_extern.h	2007-11-07 00:45:09.000000000 +0530
@@ -58,7 +58,7 @@ extern struct inode *		vxfs_get_fake_ino
 extern void			vxfs_put_fake_inode(struct inode *);
 extern struct vxfs_inode_info *	vxfs_blkiget(struct super_block *, u_long, ino_t);
 extern struct vxfs_inode_info *	vxfs_stiget(struct super_block *, ino_t);
-extern struct inode *		vxfs_iget(struct super_block *, unsigned long);
+extern struct inode *		vxfs_iget(struct super_block *sbp, ino_t ino);
 extern void			vxfs_clear_inode(struct inode *);
 
 /* vxfs_lookup.c */

--
Thanks & Regards,
Kamalesh Babulal,
Linux Technology Center,
IBM, ISTL.

Re: [PATCH] mm snapshot broken-out-2007-11-06-02-32 - conflict in vxfs_iget ()

[David Howells]

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> wrote:

> The kernel build fails on S390, with error 

I gave Andrew the attached patch which is very similar to yours.

David


[-- Attachment #2: 7861 --]
[-- Type: message/rfc822, Size: 2544 bytes --]

From: David Howells <dhowells@redhat.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, dhowells@redhat.com
Subject: [PATCH] IGET: Use ino_t consistently for vxfs_iget() and its declaration
Date: Tue, 06 Nov 2007 14:15:54 +0000
Message-ID: <20071106141554.17691.1661.stgit@warthog.procyon.org.uk>

Use ino_t consistently for vxfs_iget() and its declaration, rather than using
ino_t for one and unsigned long for the other.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 fs/freevxfs/vxfs_extern.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/fs/freevxfs/vxfs_extern.h b/fs/freevxfs/vxfs_extern.h
index f307694..2b46064 100644
--- a/fs/freevxfs/vxfs_extern.h
+++ b/fs/freevxfs/vxfs_extern.h
@@ -58,7 +58,7 @@ extern struct inode *		vxfs_get_fake_inode(struct super_block *,
 extern void			vxfs_put_fake_inode(struct inode *);
 extern struct vxfs_inode_info *	vxfs_blkiget(struct super_block *, u_long, ino_t);
 extern struct vxfs_inode_info *	vxfs_stiget(struct super_block *, ino_t);
-extern struct inode *		vxfs_iget(struct super_block *, unsigned long);
+extern struct inode *		vxfs_iget(struct super_block *, ino_t);
 extern void			vxfs_clear_inode(struct inode *);
 
 /* vxfs_lookup.c */