lkml.org 
[lkml]   [2011]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/4] SUNRPC: use passed network namespace context in rpc_pton6()
    From
    Date
    Use incomming network context in rpc_pton6() instead of hard-coded "init_net".

    Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>

    ---
    net/sunrpc/addr.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/net/sunrpc/addr.c b/net/sunrpc/addr.c
    index 35eb188..c13a521 100644
    --- a/net/sunrpc/addr.c
    +++ b/net/sunrpc/addr.c
    @@ -198,7 +198,7 @@ static int rpc_parse_scope_id(struct net *net, const char *buf,
    return 0;
    }

    -static size_t rpc_pton6(const char *buf, const size_t buflen,
    +static size_t rpc_pton6(struct net *net, const char *buf, const size_t buflen,
    struct sockaddr *sap, const size_t salen)
    {
    struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)sap;
    @@ -214,14 +214,14 @@ static size_t rpc_pton6(const char *buf, const size_t buflen,
    if (in6_pton(buf, buflen, addr, IPV6_SCOPE_DELIMITER, &delim) == 0)
    return 0;

    - if (!rpc_parse_scope_id(&init_net, buf, buflen, delim, sin6))
    + if (!rpc_parse_scope_id(net, buf, buflen, delim, sin6))
    return 0;

    sin6->sin6_family = AF_INET6;
    return sizeof(struct sockaddr_in6);
    }
    #else
    -static size_t rpc_pton6(const char *buf, const size_t buflen,
    +static size_t rpc_pton6(struct net *net, const char *buf, const size_t buflen,
    struct sockaddr *sap, const size_t salen)
    {
    return 0;
    @@ -249,7 +249,7 @@ size_t rpc_pton(const char *buf, const size_t buflen,

    for (i = 0; i < buflen; i++)
    if (buf[i] == ':')
    - return rpc_pton6(buf, buflen, sap, salen);
    + return rpc_pton6(&init_net, buf, buflen, sap, salen);
    return rpc_pton4(buf, buflen, sap, salen);
    }
    EXPORT_SYMBOL_GPL(rpc_pton);


    \
     
     \ /
      Last update: 2011-12-07 12:23    [W:0.022 / U:31.400 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site