mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
lockd: Register callbacks on the inetaddr_chain and inet6addr_chain
Register callbacks on inetaddr_chain and inet6addr_chain to trigger cleanup of lockd transport sockets when an ip address is deleted. Signed-off-by: Scott Mayhew <smayhew@redhat.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
parent
366849966f
commit
0751ddf77b
1 changed files with 72 additions and 2 deletions
|
@ -25,13 +25,17 @@
|
||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/kthread.h>
|
#include <linux/kthread.h>
|
||||||
#include <linux/freezer.h>
|
#include <linux/freezer.h>
|
||||||
|
#include <linux/inetdevice.h>
|
||||||
|
|
||||||
#include <linux/sunrpc/types.h>
|
#include <linux/sunrpc/types.h>
|
||||||
#include <linux/sunrpc/stats.h>
|
#include <linux/sunrpc/stats.h>
|
||||||
#include <linux/sunrpc/clnt.h>
|
#include <linux/sunrpc/clnt.h>
|
||||||
#include <linux/sunrpc/svc.h>
|
#include <linux/sunrpc/svc.h>
|
||||||
#include <linux/sunrpc/svcsock.h>
|
#include <linux/sunrpc/svcsock.h>
|
||||||
|
#include <linux/sunrpc/svc_xprt.h>
|
||||||
#include <net/ip.h>
|
#include <net/ip.h>
|
||||||
|
#include <net/addrconf.h>
|
||||||
|
#include <net/ipv6.h>
|
||||||
#include <linux/lockd/lockd.h>
|
#include <linux/lockd/lockd.h>
|
||||||
#include <linux/nfs.h>
|
#include <linux/nfs.h>
|
||||||
|
|
||||||
|
@ -279,6 +283,68 @@ static void lockd_down_net(struct svc_serv *serv, struct net *net)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int lockd_inetaddr_event(struct notifier_block *this,
|
||||||
|
unsigned long event, void *ptr)
|
||||||
|
{
|
||||||
|
struct in_ifaddr *ifa = (struct in_ifaddr *)ptr;
|
||||||
|
struct sockaddr_in sin;
|
||||||
|
|
||||||
|
if (event != NETDEV_DOWN)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
if (nlmsvc_rqst) {
|
||||||
|
dprintk("lockd_inetaddr_event: removed %pI4\n",
|
||||||
|
&ifa->ifa_local);
|
||||||
|
sin.sin_family = AF_INET;
|
||||||
|
sin.sin_addr.s_addr = ifa->ifa_local;
|
||||||
|
svc_age_temp_xprts_now(nlmsvc_rqst->rq_server,
|
||||||
|
(struct sockaddr *)&sin);
|
||||||
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
return NOTIFY_DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct notifier_block lockd_inetaddr_notifier = {
|
||||||
|
.notifier_call = lockd_inetaddr_event,
|
||||||
|
};
|
||||||
|
|
||||||
|
#if IS_ENABLED(CONFIG_IPV6)
|
||||||
|
static int lockd_inet6addr_event(struct notifier_block *this,
|
||||||
|
unsigned long event, void *ptr)
|
||||||
|
{
|
||||||
|
struct inet6_ifaddr *ifa = (struct inet6_ifaddr *)ptr;
|
||||||
|
struct sockaddr_in6 sin6;
|
||||||
|
|
||||||
|
if (event != NETDEV_DOWN)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
if (nlmsvc_rqst) {
|
||||||
|
dprintk("lockd_inet6addr_event: removed %pI6\n", &ifa->addr);
|
||||||
|
sin6.sin6_family = AF_INET6;
|
||||||
|
sin6.sin6_addr = ifa->addr;
|
||||||
|
svc_age_temp_xprts_now(nlmsvc_rqst->rq_server,
|
||||||
|
(struct sockaddr *)&sin6);
|
||||||
|
}
|
||||||
|
|
||||||
|
out:
|
||||||
|
return NOTIFY_DONE;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct notifier_block lockd_inet6addr_notifier = {
|
||||||
|
.notifier_call = lockd_inet6addr_event,
|
||||||
|
};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
static void lockd_svc_exit_thread(void)
|
||||||
|
{
|
||||||
|
unregister_inetaddr_notifier(&lockd_inetaddr_notifier);
|
||||||
|
#if IS_ENABLED(CONFIG_IPV6)
|
||||||
|
unregister_inet6addr_notifier(&lockd_inet6addr_notifier);
|
||||||
|
#endif
|
||||||
|
svc_exit_thread(nlmsvc_rqst);
|
||||||
|
}
|
||||||
|
|
||||||
static int lockd_start_svc(struct svc_serv *serv)
|
static int lockd_start_svc(struct svc_serv *serv)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
@ -315,7 +381,7 @@ static int lockd_start_svc(struct svc_serv *serv)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
out_task:
|
out_task:
|
||||||
svc_exit_thread(nlmsvc_rqst);
|
lockd_svc_exit_thread();
|
||||||
nlmsvc_task = NULL;
|
nlmsvc_task = NULL;
|
||||||
out_rqst:
|
out_rqst:
|
||||||
nlmsvc_rqst = NULL;
|
nlmsvc_rqst = NULL;
|
||||||
|
@ -360,6 +426,10 @@ static struct svc_serv *lockd_create_svc(void)
|
||||||
printk(KERN_WARNING "lockd_up: create service failed\n");
|
printk(KERN_WARNING "lockd_up: create service failed\n");
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
}
|
}
|
||||||
|
register_inetaddr_notifier(&lockd_inetaddr_notifier);
|
||||||
|
#if IS_ENABLED(CONFIG_IPV6)
|
||||||
|
register_inet6addr_notifier(&lockd_inet6addr_notifier);
|
||||||
|
#endif
|
||||||
dprintk("lockd_up: service created\n");
|
dprintk("lockd_up: service created\n");
|
||||||
return serv;
|
return serv;
|
||||||
}
|
}
|
||||||
|
@ -428,7 +498,7 @@ lockd_down(struct net *net)
|
||||||
}
|
}
|
||||||
kthread_stop(nlmsvc_task);
|
kthread_stop(nlmsvc_task);
|
||||||
dprintk("lockd_down: service stopped\n");
|
dprintk("lockd_down: service stopped\n");
|
||||||
svc_exit_thread(nlmsvc_rqst);
|
lockd_svc_exit_thread();
|
||||||
dprintk("lockd_down: service destroyed\n");
|
dprintk("lockd_down: service destroyed\n");
|
||||||
nlmsvc_task = NULL;
|
nlmsvc_task = NULL;
|
||||||
nlmsvc_rqst = NULL;
|
nlmsvc_rqst = NULL;
|
||||||
|
|
Loading…
Reference in a new issue