Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

[karo-tx-linux.git] / fs / lockd / host.c

diff --git a/fs/lockd/host.c b/fs/lockd/host.c
index 5876b0e4c0bea3d9648f761b4e6fb7774e7de386..9fd8889097b728b735150ff82b1ff123a503dac7 100644 (file)
--- a/fs/lockd/host.c
+++ b/fs/lockd/host.c
@@ -264,46 +264,73 @@ nlm_destroy_host(struct nlm_host *host)
        kfree(host);
 }
 
-/*
- * Find an NLM server handle in the cache. If there is none, create it.
+/**
+ * nlmclnt_lookup_host - Find an NLM host handle matching a remote server
+ * @sap: network address of server
+ * @salen: length of server address
+ * @protocol: transport protocol to use
+ * @version: NLM protocol version
+ * @hostname: '\0'-terminated hostname of server
+ *
+ * Returns an nlm_host structure that matches the passed-in
+ * [server address, transport protocol, NLM version, server hostname].
+ * If one doesn't already exist in the host cache, a new handle is
+ * created and returned.
  */
-struct nlm_host *nlmclnt_lookup_host(const struct sockaddr_in *sin,
-                                    int proto, u32 version,
-                                    const char *hostname,
-                                    unsigned int hostname_len)
+struct nlm_host *nlmclnt_lookup_host(const struct sockaddr *sap,
+                                    const size_t salen,
+                                    const unsigned short protocol,
+                                    const u32 version, const char *hostname)
 {
        const struct sockaddr source = {
                .sa_family      = AF_UNSPEC,
        };
        struct nlm_lookup_host_info ni = {
                .server         = 0,
-               .sap            = (struct sockaddr *)sin,
-               .salen          = sizeof(*sin),
-               .protocol       = proto,
+               .sap            = sap,
+               .salen          = salen,
+               .protocol       = protocol,
                .version        = version,
                .hostname       = hostname,
-               .hostname_len   = hostname_len,
+               .hostname_len   = strlen(hostname),
                .src_sap        = &source,
                .src_len        = sizeof(source),
        };
 
        dprintk("lockd: %s(host='%s', vers=%u, proto=%s)\n", __func__,
                        (hostname ? hostname : "<none>"), version,
-                       (proto == IPPROTO_UDP ? "udp" : "tcp"));
+                       (protocol == IPPROTO_UDP ? "udp" : "tcp"));
 
        return nlm_lookup_host(&ni);
 }
 
-/*
- * Find an NLM client handle in the cache. If there is none, create it.
+/**
+ * nlmsvc_lookup_host - Find an NLM host handle matching a remote client
+ * @rqstp: incoming NLM request
+ * @hostname: name of client host
+ * @hostname_len: length of client hostname
+ *
+ * Returns an nlm_host structure that matches the [client address,
+ * transport protocol, NLM version, client hostname] of the passed-in
+ * NLM request.  If one doesn't already exist in the host cache, a
+ * new handle is created and returned.
+ *
+ * Before possibly creating a new nlm_host, construct a sockaddr
+ * for a specific source address in case the local system has
+ * multiple network addresses.  The family of the address in
+ * rq_daddr is guaranteed to be the same as the family of the
+ * address in rq_addr, so it's safe to use the same family for
+ * the source address.
  */
-struct nlm_host *
-nlmsvc_lookup_host(struct svc_rqst *rqstp,
-                       const char *hostname, unsigned int hostname_len)
+struct nlm_host *nlmsvc_lookup_host(const struct svc_rqst *rqstp,
+                                   const char *hostname,
+                                   const size_t hostname_len)
 {
-       const struct sockaddr_in source = {
+       struct sockaddr_in sin = {
                .sin_family     = AF_INET,
-               .sin_addr       = rqstp->rq_daddr.addr,
+       };
+       struct sockaddr_in6 sin6 = {
+               .sin6_family    = AF_INET6,
        };
        struct nlm_lookup_host_info ni = {
                .server         = 1,
@@ -313,14 +340,26 @@ nlmsvc_lookup_host(struct svc_rqst *rqstp,
                .version        = rqstp->rq_vers,
                .hostname       = hostname,
                .hostname_len   = hostname_len,
-               .src_sap        = (struct sockaddr *)&source,
-               .src_len        = sizeof(source),
+               .src_len        = rqstp->rq_addrlen,
        };
 
        dprintk("lockd: %s(host='%*s', vers=%u, proto=%s)\n", __func__,
                        (int)hostname_len, hostname, rqstp->rq_vers,
                        (rqstp->rq_prot == IPPROTO_UDP ? "udp" : "tcp"));
 
+       switch (ni.sap->sa_family) {
+       case AF_INET:
+               sin.sin_addr.s_addr = rqstp->rq_daddr.addr.s_addr;
+               ni.src_sap = (struct sockaddr *)&sin;
+               break;
+       case AF_INET6:
+               ipv6_addr_copy(&sin6.sin6_addr, &rqstp->rq_daddr.addr6);
+               ni.src_sap = (struct sockaddr *)&sin6;
+               break;
+       default:
+               return NULL;
+       }
+
        return nlm_lookup_host(&ni);
 }