[SUNRPC]: more sunrpc endianness annotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c
index a2587e8..638c0b5 100644 (file)
--- a/net/sunrpc/auth_gss/svcauth_gss.c
+++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -620,7 +620,7 @@ svc_safe_getnetobj(struct kvec *argv, struct xdr_netobj *o)
 static inline int
 svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o)
 {
-       u32 *p;
+       u8 *p;
 
        if (resv->iov_len + 4 > PAGE_SIZE)
                return -1;
@@ -630,7 +630,7 @@ svc_safe_putnetobj(struct kvec *resv, struct xdr_netobj *o)
        if (resv->iov_len > PAGE_SIZE)
                return -1;
        memcpy(p, o->data, o->len);
-       memset((u8 *)p + o->len, 0, round_up_to_quad(o->len) - o->len);
+       memset(p + o->len, 0, round_up_to_quad(o->len) - o->len);
        return 0;
 }
 
@@ -1219,8 +1219,8 @@ svcauth_gss_wrap_resp_priv(struct svc_rqst *rqstp)
        struct rpc_gss_wire_cred *gc = &gsd->clcred;
        struct xdr_buf *resbuf = &rqstp->rq_res;
        struct page **inpages = NULL;
-       __be32 *p;
-       int offset, *len;
+       __be32 *p, *len;
+       int offset;
        int pad;
 
        p = gsd->body_start;

diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c
index f98229f..1020d54 100644 (file)
--- a/net/sunrpc/svcauth_unix.c
+++ b/net/sunrpc/svcauth_unix.c
@@ -249,10 +249,10 @@ static int ip_map_show(struct seq_file *m,
 
        seq_printf(m, "%s %d.%d.%d.%d %s\n",
                   im->m_class,
-                  htonl(addr.s_addr) >> 24 & 0xff,
-                  htonl(addr.s_addr) >> 16 & 0xff,
-                  htonl(addr.s_addr) >>  8 & 0xff,
-                  htonl(addr.s_addr) >>  0 & 0xff,
+                  ntohl(addr.s_addr) >> 24 & 0xff,
+                  ntohl(addr.s_addr) >> 16 & 0xff,
+                  ntohl(addr.s_addr) >>  8 & 0xff,
+                  ntohl(addr.s_addr) >>  0 & 0xff,
                   dom
                   );
        return 0;