[PATCH] nfs functions undefined [Was: mm snapshot broken-out-2007-11-13-04-14.tar.gz uploaded]

[Randy Dunlap <randy.dunlap@oracle.com>]

On Tue, 13 Nov 2007 13:50:48 +0100 Jiri Slaby wrote:

> On 11/13/2007 01:15 PM, akpm@linux-foundation.org wrote:
> > The mm snapshot broken-out-2007-11-13-04-14.tar.gz has been uploaded to
> 
> ERROR: "nfs_put_super" [fs/nfs/nfs.ko] undefined!
> ERROR: "nfs_sb_deactive" [fs/nfs/nfs.ko] undefined!
> make[2]: *** [__modpost] Error 1
> make[1]: *** [modules] Error 2
> 
> config:
> http://www.fi.muni.cz/~xslaby/sklad/config_64



From: Randy Dunlap <randy.dunlap@oracle.com>

nfs_put_super() and nfs_sb_deactive() should not be inside an
ifdef CONFIG_NFS_V4 block.

ERROR: "nfs_put_super" [fs/nfs/nfs.ko] undefined!
ERROR: "nfs_sb_deactive" [fs/nfs/nfs.ko] undefined!

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 fs/nfs/super.c |   34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

--- linux-2624-rc2-mmbo.orig/fs/nfs/super.c
+++ linux-2624-rc2-mmbo/fs/nfs/super.c
@@ -1499,6 +1499,23 @@ error_splat_super:
 	return error;
 }
 
+static void nfs_put_super(struct super_block *sb)
+{
+	struct nfs_server *server = NFS_SB(sb);
+	/*
+	 * Make sure there are no outstanding ops to this server.
+	 * If so, wait for them to finish before allowing the
+	 * unmount to continue.
+	 */
+	wait_event(server->active_wq, atomic_read(&server->active) == 0);
+}
+
+void nfs_sb_deactive(struct nfs_server *server)
+{
+	if (atomic_dec_and_test(&server->active))
+		wake_up(&server->active_wq);
+}
+
 #ifdef CONFIG_NFS_V4
 
 /*
@@ -1771,17 +1788,6 @@ static void nfs4_kill_super(struct super
 	nfs_free_server(server);
 }
 
-static void nfs_put_super(struct super_block *sb)
-{
-	struct nfs_server *server = NFS_SB(sb);
-	/*
-	 * Make sure there are no outstanding ops to this server.
-	 * If so, wait for them to finish before allowing the
-	 * unmount to continue.
-	 */
-	wait_event(server->active_wq, atomic_read(&server->active) == 0);
-}
-
 /*
  * Clone an NFS4 server record on xdev traversal (FSID-change)
  */
@@ -1929,10 +1935,4 @@ error_splat_super:
 	return error;
 }
 
-void nfs_sb_deactive(struct nfs_server *server)
-{
-	if (atomic_dec_and_test(&server->active))
-		wake_up(&server->active_wq);
-}
-
 #endif /* CONFIG_NFS_V4 */