cifs: remove never-used in6_addr option

[safe/jmp/linux-2.6] / fs / cifs / cifs_spnego.c

diff --git a/fs/cifs/cifs_spnego.c b/fs/cifs/cifs_spnego.c
index ae4be82..4a4581c 100644 (file)
--- a/fs/cifs/cifs_spnego.c
+++ b/fs/cifs/cifs_spnego.c
@@ -23,6 +23,7 @@
 #include <linux/string.h>
 #include <keys/user-type.h>
 #include <linux/key-type.h>
+#include <linux/inet.h>
 #include "cifsglob.h"
 #include "cifs_spnego.h"
 #include "cifs_debug.h"
@@ -41,7 +42,7 @@ cifs_spnego_key_instantiate(struct key *key, const void *data, size_t datalen)
 
        /* attach the data */
        memcpy(payload, data, datalen);
-       rcu_assign_pointer(key->payload.data, payload);
+       key->payload.data = payload;
        ret = 0;
 
 error:
@@ -73,9 +74,6 @@ struct key_type cifs_spnego_key_type = {
  * strlen(";sec=ntlmsspi") */
 #define MAX_MECH_STR_LEN       13
 
-/* max possible addr len eg FEDC:BA98:7654:3210:FEDC:BA98:7654:3210/60 */
-#define MAX_IPV6_ADDR_LEN      42
-
 /* strlen of "host=" */
 #define HOST_KEY_LEN           5
 
@@ -102,7 +100,7 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
           host=hostname sec=mechanism uid=0xFF user=username */
        desc_len = MAX_VER_STR_LEN +
                   HOST_KEY_LEN + strlen(hostname) +
-                  IP_KEY_LEN + MAX_IPV6_ADDR_LEN +
+                  IP_KEY_LEN + INET6_ADDRSTRLEN +
                   MAX_MECH_STR_LEN +
                   UID_KEY_LEN + (sizeof(uid_t) * 2) +
                   USER_KEY_LEN + strlen(sesInfo->userName) + 1;
@@ -121,10 +119,9 @@ cifs_get_spnego_key(struct cifsSesInfo *sesInfo)
 
        /* add the server address */
        if (server->addr.sockAddr.sin_family == AF_INET)
-               sprintf(dp, "ip4=" NIPQUAD_FMT,
-                       NIPQUAD(server->addr.sockAddr.sin_addr));
+               sprintf(dp, "ip4=%pI4", &server->addr.sockAddr.sin_addr);
        else if (server->addr.sockAddr.sin_family == AF_INET6)
-               sprintf(dp, "ip6=%#p6", &server->addr.sockAddr6.sin6_addr);
+               sprintf(dp, "ip6=%pi6", &server->addr.sockAddr6.sin6_addr);
        else
                goto out;