Subject: linux-next: build failure after merge of the nfs tree

From: Stephen Rothwell <[email-masked]>
Date: Thu, 12 May 2011 11:12:55 +1000

Hi Trond,

After merging the nfs tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

fs/nfs/write.c: In function 'nfs_flush_multi':
fs/nfs/write.c:942: error: too many arguments to function 'pnfs_update_layout'
fs/nfs/write.c: In function 'nfs_flush_one':
fs/nfs/write.c:1016: error: too many arguments to function 'pnfs_update_layout'
fs/nfs/read.c: In function 'nfs_pagein_multi':
fs/nfs/read.c:291: error: too many arguments to function 'pnfs_update_layout'
fs/nfs/read.c: In function 'nfs_pagein_one':
fs/nfs/read.c:354: error: too many arguments to function 'pnfs_update_layout'

Cased by commit 4b386a0fe47b ("NFSv4.1: Ensure that layoutget uses the
correct gfp modes") which forgot to update the function declaration for
the !CONFIG_NFS_V4_1 case.

I have used the nfs tree from next-20110511 for today.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
IBM OzLabs Linux Technology Centre