Merge branch 'stable/for-linus-4.5' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c
index 44d18ad4d364c1b1089526801d6db651da02d510..154a107cd376238349ef6a889bb85ab0d23a0e31 100644 (file)
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
@@ -48,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);
@@ -94,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);