2 files changed, 2 insertions, 1 deletions

diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c
index e630b38a6047..66d458fc6920 100644
--- a/net/sunrpc/auth_gss/auth_gss.c
+++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -1548,6 +1548,7 @@ static void __exit exit_rpcsec_gss(void)
 {
         gss_svc_shutdown();
         rpcauth_unregister(&authgss_ops);
+        rcu_barrier(); /* Wait for completion of call_rcu()'s */
 }
 
 MODULE_LICENSE("GPL");
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c
index e18596146013..6c2d61586551 100644
--- a/net/sunrpc/xprtsock.c
+++ b/net/sunrpc/xprtsock.c
@@ -918,7 +918,7 @@ static void xs_udp_data_ready(struct sock *sk, int len)
         UDPX_INC_STATS_BH(sk, UDP_MIB_INDATAGRAMS);
 
         /* Something worked... */
-        dst_confirm(skb->dst);
+        dst_confirm(skb_dst(skb));
 
         xprt_adjust_cwnd(task, copied);
         xprt_update_rtt(task);