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

[David Howells]

Kamalesh Babulal <kamalesh@xxxxxxxxxxxxxxxxxx> wrote:

> The kernel build fails on S390, with error 

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

David

> --- Begin Message ---
> 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@xxxxxxxxxx>
> ---
>
>  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 */
>
>
> --- End Message ---