lkml.org 
[lkml]   [2007]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patches in this message
    /
    From
    Date
    Subject[PATCH 009 of 14] knfsd: SUNRPC: Make rq_daddr field address-version independent

    From: Chuck Lever <chuck.lever@oracle.com>
    The rq_daddr field must support larger addresses.

    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Cc: Aurelien Charbon <aurelien.charbon@ext.bull.net>
    Signed-off-by: Neil Brown <neilb@suse.de>

    ### Diffstat output
    ./include/linux/sunrpc/svc.h | 15 +++++++++++----
    ./net/sunrpc/svcsock.c | 4 ++--
    2 files changed, 13 insertions(+), 6 deletions(-)

    diff .prev/include/linux/sunrpc/svc.h ./include/linux/sunrpc/svc.h
    --- .prev/include/linux/sunrpc/svc.h 2007-02-02 15:22:32.000000000 +1100
    +++ ./include/linux/sunrpc/svc.h 2007-02-02 15:22:32.000000000 +1100
    @@ -11,6 +11,7 @@
    #define SUNRPC_SVC_H

    #include <linux/in.h>
    +#include <linux/in6.h>
    #include <linux/sunrpc/types.h>
    #include <linux/sunrpc/xdr.h>
    #include <linux/sunrpc/auth.h>
    @@ -191,7 +192,13 @@ static inline void svc_putu32(struct kve
    iov->iov_len += sizeof(__be32);
    }

    -
    +union svc_addr_u {
    + struct in_addr addr;
    +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
    + struct in6_addr addr6;
    +#endif
    +};
    +
    /*
    * The context of a single thread, including the request currently being
    * processed.
    @@ -227,8 +234,8 @@ struct svc_rqst {
    unsigned short
    rq_secure : 1; /* secure port */

    -
    - __be32 rq_daddr; /* dest addr of request - reply from here */
    + union svc_addr_u rq_daddr; /* dest addr of request
    + * - reply from here */

    void * rq_argp; /* decoded arguments */
    void * rq_resp; /* xdr'd results */
    @@ -308,7 +315,7 @@ struct svc_deferred_req {
    struct svc_sock *svsk;
    struct sockaddr_storage addr; /* where reply must go */
    size_t addrlen;
    - __be32 daddr; /* where reply must come from */
    + union svc_addr_u daddr; /* where reply must come from */
    struct cache_deferred_req handle;
    int argslen;
    __be32 args[0];
    diff .prev/net/sunrpc/svcsock.c ./net/sunrpc/svcsock.c
    --- .prev/net/sunrpc/svcsock.c 2007-02-02 15:22:32.000000000 +1100
    +++ ./net/sunrpc/svcsock.c 2007-02-02 15:22:32.000000000 +1100
    @@ -476,7 +476,7 @@ svc_sendto(struct svc_rqst *rqstp, struc
    cmh->cmsg_level = SOL_IP;
    cmh->cmsg_type = IP_PKTINFO;
    pki->ipi_ifindex = 0;
    - pki->ipi_spec_dst.s_addr = rqstp->rq_daddr;
    + pki->ipi_spec_dst.s_addr = rqstp->rq_daddr.addr.s_addr;

    if (sock_sendmsg(sock, &msg, 0) < 0)
    goto out;
    @@ -750,7 +750,7 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
    rqstp->rq_addrlen = sizeof(struct sockaddr_in);

    /* Remember which interface received this request */
    - rqstp->rq_daddr = skb->nh.iph->daddr;
    + rqstp->rq_daddr.addr.s_addr = skb->nh.iph->daddr;

    if (skb_is_nonlinear(skb)) {
    /* we have to copy */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-02-02 05:49    [W:4.096 / U:0.668 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site