Re: linux-next: build failure after merge of the final tree (nfstree related)

[Myklebust, Trond]

On Tue, 2012-03-20 at 19:29 +1100, Stephen Rothwell wrote:
> Hi Trond,
> 
> [This was previously reported as a warning ... but sparc uses -Werr in
> more places]
> 
> After merging the final tree, today's linux-next build (sparc64 defconfig)
> failed like this:
> 
> In file included from arch/sparc/kernel/sys_sparc32.c:24:0:
> include/linux/nfs_fs.h: In function 'nfs_display_fhandle_hash':
> include/linux/nfs_fs.h:416:1: error: no return statement in function returning non-void [-Werror=return-type]
> 
> Caused by commit d8e0539ebdff ("NFS: add filehandle crc for debug display").
> 
> I added the following patch for today:
> 
> From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> Date: Tue, 20 Mar 2012 19:26:42 +1100
> Subject: [PATCH] nfs: non void functions must return a value
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
> ---
>  include/linux/nfs_fs.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
> index 8f27c2e..69ec9cb 100644
> --- a/include/linux/nfs_fs.h
> +++ b/include/linux/nfs_fs.h
> @@ -413,6 +413,7 @@ extern void _nfs_display_fhandle(const struct nfs_fh *fh, const char *caption);
>  #else
>  static inline u32 nfs_display_fhandle_hash(const struct nfs_fh *fh)
>  {
> +	return 0;
>  }
>  static inline void nfs_display_fhandle(const struct nfs_fh *fh,
>  				       const char *caption)

Thanks Stephen! I've applied the above patch to my tree.

Cheers
  Trond

-- 
Trond Myklebust
Linux NFS client maintainer

NetApp
Trond.Myklebust@xxxxxxxxxx
www.netapp.com

N‹§²æìr¸›yúèšØb²X¬¶ÇvØ^–)Þ{.nÇ+‰·¥Š{±‘êçzX§¶›¡Ü}©ž²ÆzÚ&j:+v‰¨¾«‘êçzZ+€Ê+zf£¢·hšˆ§~†­†Ûiÿûàz¹®w¥¢¸?™¨è­Ú&¢)ßf”ù^jÇy§m…á@A«a¶Úÿ0¶ìh®å’i