lkml.org 
[lkml]   [2002]   [Oct]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
SubjectRe: nfsd/sunrpc boot on reboot in 2.5.44
On Sunday October 20, ahu@ds9a.nl wrote:
> My Debian sid machine oopses when I run 'sudo reboot'.
>

Sorry 'bout that. Appended patch should fix it.
When the last daemon exits all exports are automatically unexported,
and it was releasing too much so when "exportfs -a" came along it
tried to access some deallocated data strctures.

NeilBrown

-------------------------
Fix nfs shutdown problem.
The 'unexport everything' that happens when the
last nfsd thread dies was shuting down too much -
things that should only be shut down on module unload.



----------- Diffstat output ------------
./fs/nfsd/export.c | 31 ++++++++++++-------------------
./fs/nfsd/nfssvc.c | 2 +-
./include/linux/nfsd/export.h | 1 +
./net/sunrpc/sunrpc_syms.c | 1 +
4 files changed, 15 insertions(+), 20 deletions(-)
--- ./fs/nfsd/export.c 2002/10/20 23:48:51 1.1
+++ ./fs/nfsd/export.c 2002/10/21 03:23:44 1.2
@@ -738,23 +738,6 @@ exp_do_unexport(svc_export *unexp)
exp_fsid_unhash(unexp);
}

-/*
- * Revoke all exports for a given client.
- */
-static void
-exp_unexport_all(svc_client *clp)
-{
- struct svc_export *exp;
- int index;
-
- dprintk("unexporting all fs's for clnt %p\n", clp);
-
- cache_for_each(exp, &svc_export_cache, index, h)
- if (exp->ex_client == clp)
- exp_do_unexport(exp);
- cache_flush();
-
-}

/*
* unexport syscall.
@@ -1109,6 +1092,18 @@ nfsd_export_init(void)
}

/*
+ * Flush exports table - called when last nfsd thread is killed
+ */
+void
+nfsd_export_flush(void)
+{
+ exp_writelock();
+ cache_purge(&svc_expkey_cache);
+ cache_purge(&svc_export_cache);
+ exp_writeunlock();
+}
+
+/*
* Shutdown the exports module.
*/
void
@@ -1119,8 +1114,6 @@ nfsd_export_shutdown(void)

exp_writelock();

- exp_unexport_all(NULL);
-
if (cache_unregister(&svc_expkey_cache))
printk(KERN_ERR "nfsd: failed to unregister expkey cache\n");
if (cache_unregister(&svc_export_cache))
--- ./fs/nfsd/nfssvc.c 2002/10/20 23:53:59 1.1
+++ ./fs/nfsd/nfssvc.c 2002/10/21 03:23:44 1.2
@@ -238,7 +238,7 @@ nfsd(struct svc_rqst *rqstp)
printk(KERN_WARNING "nfsd: last server has exited\n");
if (err != SIG_NOCLEAN) {
printk(KERN_WARNING "nfsd: unexporting all filesystems\n");
- nfsd_export_shutdown();
+ nfsd_export_flush();
}
nfsd_serv = NULL;
nfsd_racache_shutdown(); /* release read-ahead cache */
--- ./include/linux/nfsd/export.h 2002/10/20 23:53:38 1.1
+++ ./include/linux/nfsd/export.h 2002/10/21 03:23:44 1.2
@@ -83,6 +83,7 @@ struct svc_expkey {
*/
void nfsd_export_init(void);
void nfsd_export_shutdown(void);
+void nfsd_export_flush(void);
void exp_readlock(void);
void exp_readunlock(void);
struct svc_expkey * exp_find_key(struct auth_domain *clp,
--- ./net/sunrpc/sunrpc_syms.c 2002/10/20 23:53:09 1.1
+++ ./net/sunrpc/sunrpc_syms.c 2002/10/21 03:23:44 1.2
@@ -101,6 +101,7 @@ EXPORT_SYMBOL(auth_unix_lookup);
EXPORT_SYMBOL(cache_check);
EXPORT_SYMBOL(cache_clean);
EXPORT_SYMBOL(cache_flush);
+EXPORT_SYMBOL(cache_purge);
EXPORT_SYMBOL(cache_fresh);
EXPORT_SYMBOL(cache_init);
EXPORT_SYMBOL(cache_register);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:30    [from the cache]
©2003-2011 Jasper Spaans