Merge tag 'perf-urgent-for-mingo-2' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / fs / lockd / svc.c

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 5f31ebd..154a107 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -25,13 +25,17 @@
 #include <linux/mutex.h>
 #include <linux/kthread.h>
 #include <linux/freezer.h>
+#include <linux/inetdevice.h>
 
 #include <linux/sunrpc/types.h>
 #include <linux/sunrpc/stats.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcsock.h>
+#include <linux/sunrpc/svc_xprt.h>
 #include <net/ip.h>
+#include <net/addrconf.h>
+#include <net/ipv6.h>
 #include <linux/lockd/lockd.h>
 #include <linux/nfs.h>
 
@@ -44,7 +48,7 @@
 
 static struct svc_program      nlmsvc_program;
 
-struct nlmsvc_binding *                nlmsvc_ops;
+const struct nlmsvc_binding    *nlmsvc_ops;
 EXPORT_SYMBOL_GPL(nlmsvc_ops);
 
 static DEFINE_MUTEX(nlmsvc_mutex);
@@ -90,8 +94,7 @@ static unsigned long get_lockd_grace_period(void)
 
 static void grace_ender(struct work_struct *grace)
 {
-       struct delayed_work *dwork = container_of(grace, struct delayed_work,
-                                                 work);
+       struct delayed_work *dwork = to_delayed_work(grace);
        struct lockd_net *ln = container_of(dwork, struct lockd_net,
                                            grace_period_end);
 
@@ -279,6 +282,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)
 {
        int error;
@@ -315,7 +380,7 @@ static int lockd_start_svc(struct svc_serv *serv)
        return 0;
 
 out_task:
-       svc_exit_thread(nlmsvc_rqst);
+       lockd_svc_exit_thread();
        nlmsvc_task = NULL;
 out_rqst:
        nlmsvc_rqst = NULL;
@@ -360,6 +425,10 @@ static struct svc_serv *lockd_create_svc(void)
                printk(KERN_WARNING "lockd_up: create service failed\n");
                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");
        return serv;
 }
@@ -428,7 +497,7 @@ lockd_down(struct net *net)
        }
        kthread_stop(nlmsvc_task);
        dprintk("lockd_down: service stopped\n");
-       svc_exit_thread(nlmsvc_rqst);
+       lockd_svc_exit_thread();
        dprintk("lockd_down: service destroyed\n");
        nlmsvc_task = NULL;
        nlmsvc_rqst = NULL;