SUNRPC: Replace svc_addr_u by sockaddr_storage

For IPv6 local address, lockd can not callback to client for
missing scope id when binding address at inet6_bind:

 324       if (addr_type & IPV6_ADDR_LINKLOCAL) {
 325               if (addr_len >= sizeof(struct sockaddr_in6) &&
 326                   addr->sin6_scope_id) {
 327                       /* Override any existing binding, if another one
 328                        * is supplied by user.
 329                        */
 330                       sk->sk_bound_dev_if = addr->sin6_scope_id;
 331               }
 332
 333               /* Binding to link-local address requires an interface */
 334               if (!sk->sk_bound_dev_if) {
 335                       err = -EINVAL;
 336                       goto out_unlock;
 337               }

Replacing svc_addr_u by sockaddr_storage, let rqstp->rq_daddr contains more info
besides address.

Reviewed-by: Jeff Layton <jlayton@redhat.com>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

1 files changed, 2 insertions, 23 deletions

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index b7c99bfb3da6..6f29836ec0cb 100644
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -316,14 +316,8 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
         struct hlist_node *pos;
         struct nlm_host *host = NULL;
         struct nsm_handle *nsm = NULL;
-        struct sockaddr_in sin = {
-                .sin_family     = AF_INET,
-        };
-        struct sockaddr_in6 sin6 = {
-                .sin6_family    = AF_INET6,
-        };
-        struct sockaddr *src_sap;
-        size_t src_len = rqstp->rq_addrlen;
+        struct sockaddr *src_sap = svc_daddr(rqstp);
+        size_t src_len = rqstp->rq_daddrlen;
         struct nlm_lookup_host_info ni = {
                 .server         = 1,
                 .sap            = svc_addr(rqstp),
@@ -340,21 +334,6 @@ struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
 
         mutex_lock(&nlm_host_mutex);
 
-        switch (ni.sap->sa_family) {
-        case AF_INET:
-                sin.sin_addr.s_addr = rqstp->rq_daddr.addr.s_addr;
-                src_sap = (struct sockaddr *)&sin;
-                break;
-        case AF_INET6:
-                ipv6_addr_copy(&sin6.sin6_addr, &rqstp->rq_daddr.addr6);
-                src_sap = (struct sockaddr *)&sin6;
-                break;
-        default:
-                dprintk("lockd: %s failed; unrecognized address family\n",
-                        __func__);
-                goto out;
-        }
-
         if (time_after_eq(jiffies, next_gc))
                 nlm_gc_hosts();