Module Name:    src
Committed By:   ad
Date:           Sat May 23 14:45:18 UTC 2009

Modified Files:
        src/sys/nfs: nfs_serv.c

Log Message:
Fix a crash when unloading nfsserver module.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/nfs/nfs_serv.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/nfs/nfs_serv.c
diff -u src/sys/nfs/nfs_serv.c:1.144 src/sys/nfs/nfs_serv.c:1.145
--- src/sys/nfs/nfs_serv.c:1.144	Fri Apr 10 18:58:50 2009
+++ src/sys/nfs/nfs_serv.c	Sat May 23 14:45:18 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: nfs_serv.c,v 1.144 2009/04/10 18:58:50 bouyer Exp $	*/
+/*	$NetBSD: nfs_serv.c,v 1.145 2009/05/23 14:45:18 ad Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.144 2009/04/10 18:58:50 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.145 2009/05/23 14:45:18 ad Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -120,8 +120,8 @@
 		}
 		nfs_init();	/* XXX for monolithic kernel */
 		rw_init(&netexport_lock);
-		nfsrv_init(0);		/* Init server data structures */
 		nfsrv_initcache();	/* Init the server request cache */
+		nfsrv_init(0);		/* Init server data structures */
 		vfs_hooks_attach(&nfs_export_hooks);
 		nfs_timer_srvinit(nfsrv_timer);
 		return 0;
@@ -132,8 +132,8 @@
 		}
 		nfs_timer_srvfini();
 		vfs_hooks_detach(&nfs_export_hooks);
-		nfsrv_finicache();
 		nfsrv_fini();
+		nfsrv_finicache();
 		rw_destroy(&netexport_lock);
 		return 0;
 	default:

Reply via email to