Subject: linux-next: nfs tree build failure

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Dec 2009 19:23:15 +1100

Hi ,

Today's linux-next build (powerpc ppc44x_defconfig) failed like this:

fs/built-in.o: In function `nfs_readpage_retry':
read.c:(.text+0x79228): undefined reference to `nfs4_restart_rpc'
fs/built-in.o: In function `nfs_async_unlink_done':
unlink.c:(.text+0x7a0c0): undefined reference to `nfs4_restart_rpc'
fs/built-in.o: In function `nfs_writeback_done':
(.text+0x7b614): undefined reference to `nfs4_restart_rpc'

Caused by commit e608e79f1bf4b967afcf57777e63b5f0939b00e8 ("nfs41: call
free slot from nfs4_restart_rpc").  This build is done without
CONFIG_NFS_V4, so nfs4proc.o is not built.

I applied this patch for today:

From: Stephen Rothwell <[email-masked]>
Date: Mon, 7 Dec 2009 19:14:54 +1100
Subject: [PATCH] nfs: fixup for non NFS_V4 build

Signed-off-by: Stephen Rothwell <[email-masked]>
---
 fs/nfs/internal.h |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index b1a020c..23f1fd2 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -197,9 +197,15 @@ extern const u32 nfs41_maxwrite_overhead;
 #endif
 
 /* nfs4proc.c */
-extern void nfs4_restart_rpc(struct rpc_task *, const struct nfs_client *);
 #ifdef CONFIG_NFS_V4
+extern void nfs4_restart_rpc(struct rpc_task *, const struct nfs_client *);
 extern struct rpc_procinfo nfs4_procedures[];
+#else
+static inline void nfs4_restart_rpc(struct rpc_task *task,
+		const struct nfs_client *client)
+{
+	rpc_restart_call(task);
+}
 #endif
 
 /* proc.c */
-- 
1.6.5.3

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/