diff options
author | 2012-03-21 16:42:14 -0400 | |
---|---|---|
committer | 2012-03-26 11:48:54 -0400 | |
commit | 1df00640c9111c881633d9b219f18e66c52599ec (patch) | |
tree | e36d3924d84f47ec93f6650ff1fd5b8ea7d10d24 /fs/nfsd/nfssvc.c | |
parent | NFSD: Fix nfs4_verifier memory alignment (diff) | |
parent | NFS: fix sb->s_id in nfs debug prints (diff) | |
download | linux-1df00640c9111c881633d9b219f18e66c52599ec.tar.gz linux-1df00640c9111c881633d9b219f18e66c52599ec.tar.bz2 linux-1df00640c9111c881633d9b219f18e66c52599ec.zip |
Merge nfs containerization work from Trond's tree
The nfs containerization work is a prerequisite for Jeff Layton's reboot
recovery rework.
Diffstat (limited to 'fs/nfsd/nfssvc.c')
-rw-r--r-- | fs/nfsd/nfssvc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index aacf1f4b9fb5..28dfad39f0c5 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c @@ -251,13 +251,13 @@ static void nfsd_shutdown(void) nfsd_up = false; } -static void nfsd_last_thread(struct svc_serv *serv) +static void nfsd_last_thread(struct svc_serv *serv, struct net *net) { /* When last nfsd thread exits we need to do some clean-up */ nfsd_serv = NULL; nfsd_shutdown(); - svc_rpcb_cleanup(serv); + svc_rpcb_cleanup(serv, net); printk(KERN_WARNING "nfsd: last server has exited, flushing export " "cache\n"); |