From: "J. Bruce Fields" <bfields@xxxxxxxxxx> The previous patch missed lockd_down, which has the same problem. Symptoms were crashes on unmount or reboot. Note this was fixed in a different way upstream. Acked-by: Stanislav Kinsbursky <skinsbursky@xxxxxxxxxxxxx> Signed-off-by: J. Bruce Fields <bfields@xxxxxxxxxx> --- fs/lockd/svc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index f1b3cce..c933df4 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c @@ -300,7 +300,7 @@ int lockd_up(void) { struct svc_serv *serv; int error = 0; - struct net *net = current->nsproxy->net_ns; + struct net *net = &init_net; struct lockd_net *ln = net_generic(net, lockd_net_id); mutex_lock(&nlmsvc_mutex); @@ -391,7 +391,7 @@ void lockd_down(void) { mutex_lock(&nlmsvc_mutex); - lockd_down_net(current->nsproxy->net_ns); + lockd_down_net(&init_net); if (nlmsvc_users) { if (--nlmsvc_users) goto out; -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html