Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/nfs only prevent autounload, not regular unload when we ...



details:   https://anonhg.NetBSD.org/src/rev/18b74d22f4b5
branches:  trunk
changeset: 791981:18b74d22f4b5
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Dec 14 22:04:03 2013 +0000

description:
only prevent autounload, not regular unload when we have exports

diffstat:

 sys/nfs/nfs_serv.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (38 lines):

diff -r aaa7d3ccc247 -r 18b74d22f4b5 sys/nfs/nfs_serv.c
--- a/sys/nfs/nfs_serv.c        Sat Dec 14 19:51:13 2013 +0000
+++ b/sys/nfs/nfs_serv.c        Sat Dec 14 22:04:03 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_serv.c,v 1.167 2013/12/14 16:19:28 christos Exp $  */
+/*     $NetBSD: nfs_serv.c,v 1.168 2013/12/14 22:04:03 christos Exp $  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.167 2013/12/14 16:19:28 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.168 2013/12/14 22:04:03 christos Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -125,8 +125,6 @@
                nfs_timer_srvinit(nfsrv_timer);
                return 0;
        case MODULE_CMD_FINI:
-               if (netexport_hasexports())
-                       return EBUSY;
                error = syscall_disestablish(NULL, nfsserver_syscalls);
                if (error != 0) {
                        return error;
@@ -146,6 +144,10 @@
                nfsrv_finicache();
                nfs_fini();
                return 0;
+       case MODULE_CMD_AUTOUNLOAD:
+               if (netexport_hasexports())
+                       return EBUSY;
+               /*FALLTHROUGH*/
        default:
                return ENOTTY;
        }



Home | Main Index | Thread Index | Old Index