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

[linux-2.6-block.git] / net / sunrpc / svcauth_unix.c

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index f24800f2c098c3b83d812881af05947b062a1ed3..5c865e2d299e86bd48eecd62aed16794faaf1566 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -64,7 +64,7 @@ struct auth_domain *unix_domain_find(char *name)
                rv = auth_domain_lookup(name, &new->h);
        }
 }
-EXPORT_SYMBOL(unix_domain_find);
+EXPORT_SYMBOL_GPL(unix_domain_find);
 
 static void svcauth_unix_domain_release(struct auth_domain *dom)
 {
@@ -162,13 +162,9 @@ static void ip_map_request(struct cache_detail *cd,
        struct ip_map *im = container_of(h, struct ip_map, h);
 
        if (ipv6_addr_v4mapped(&(im->m_addr))) {
-               snprintf(text_addr, 20, NIPQUAD_FMT,
-                               ntohl(im->m_addr.s6_addr32[3]) >> 24 & 0xff,
-                               ntohl(im->m_addr.s6_addr32[3]) >> 16 & 0xff,
-                               ntohl(im->m_addr.s6_addr32[3]) >>  8 & 0xff,
-                               ntohl(im->m_addr.s6_addr32[3]) >>  0 & 0xff);
+               snprintf(text_addr, 20, "%pI4", &im->m_addr.s6_addr32[3]);
        } else {
-               snprintf(text_addr, 40, NIP6_FMT, NIP6(im->m_addr));
+               snprintf(text_addr, 40, "%pI6", &im->m_addr);
        }
        qword_add(bpp, blen, im->m_class);
        qword_add(bpp, blen, text_addr);
@@ -208,13 +204,13 @@ static int ip_map_parse(struct cache_detail *cd,
        len = qword_get(&mesg, buf, mlen);
        if (len <= 0) return -EINVAL;
 
-       if (sscanf(buf, NIPQUAD_FMT "%c", &b1, &b2, &b3, &b4, &c) == 4) {
+       if (sscanf(buf, "%u.%u.%u.%u%c", &b1, &b2, &b3, &b4, &c) == 4) {
                addr.s6_addr32[0] = 0;
                addr.s6_addr32[1] = 0;
                addr.s6_addr32[2] = htonl(0xffff);
                addr.s6_addr32[3] =
                        htonl((((((b1<<8)|b2)<<8)|b3)<<8)|b4);
-       } else if (sscanf(buf, NIP6_FMT "%c",
+       } else if (sscanf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x%c",
                        &b1, &b2, &b3, &b4, &b5, &b6, &b7, &b8, &c) == 8) {
                addr.s6_addr16[0] = htons(b1);
                addr.s6_addr16[1] = htons(b2);
@@ -278,16 +274,10 @@ static int ip_map_show(struct seq_file *m,
                dom = im->m_client->h.name;
 
        if (ipv6_addr_v4mapped(&addr)) {
-               seq_printf(m, "%s " NIPQUAD_FMT " %s\n",
-                       im->m_class,
-                       ntohl(addr.s6_addr32[3]) >> 24 & 0xff,
-                       ntohl(addr.s6_addr32[3]) >> 16 & 0xff,
-                       ntohl(addr.s6_addr32[3]) >>  8 & 0xff,
-                       ntohl(addr.s6_addr32[3]) >>  0 & 0xff,
-                       dom);
+               seq_printf(m, "%s %pI4 %s\n",
+                       im->m_class, &addr.s6_addr32[3], dom);
        } else {
-               seq_printf(m, "%s " NIP6_FMT " %s\n",
-                       im->m_class, NIP6(addr), dom);
+               seq_printf(m, "%s %pI6 %s\n", im->m_class, &addr, dom);
        }
        return 0;
 }
@@ -368,7 +358,7 @@ int auth_unix_add_addr(struct in6_addr *addr, struct auth_domain *dom)
        else
                return -ENOMEM;
 }
-EXPORT_SYMBOL(auth_unix_add_addr);
+EXPORT_SYMBOL_GPL(auth_unix_add_addr);
 
 int auth_unix_forget_old(struct auth_domain *dom)
 {
@@ -380,7 +370,7 @@ int auth_unix_forget_old(struct auth_domain *dom)
        udom->addr_changes++;
        return 0;
 }
-EXPORT_SYMBOL(auth_unix_forget_old);
+EXPORT_SYMBOL_GPL(auth_unix_forget_old);
 
 struct auth_domain *auth_unix_lookup(struct in6_addr *addr)
 {
@@ -405,13 +395,13 @@ struct auth_domain *auth_unix_lookup(struct in6_addr *addr)
        cache_put(&ipm->h, &ip_map_cache);
        return rv;
 }
-EXPORT_SYMBOL(auth_unix_lookup);
+EXPORT_SYMBOL_GPL(auth_unix_lookup);
 
 void svcauth_unix_purge(void)
 {
        cache_purge(&ip_map_cache);
 }
-EXPORT_SYMBOL(svcauth_unix_purge);
+EXPORT_SYMBOL_GPL(svcauth_unix_purge);
 
 static inline struct ip_map *
 ip_map_cached_get(struct svc_rqst *rqstp)
@@ -724,7 +714,7 @@ svcauth_unix_set_client(struct svc_rqst *rqstp)
        return SVC_OK;
 }
 
-EXPORT_SYMBOL(svcauth_unix_set_client);
+EXPORT_SYMBOL_GPL(svcauth_unix_set_client);
 
 static int
 svcauth_null_accept(struct svc_rqst *rqstp, __be32 *authp)