lkml.org 
[lkml]   [2006]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 04/11] nfs4: initialize cl_ipaddr
    From: J. Bruce Fields <bfields@fieldses.org>

    David forgot to do this. I'm not sure if this is the right place to put
    it....

    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    ---

    fs/nfs/client.c | 8 ++++++--
    1 files changed, 6 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/client.c b/fs/nfs/client.c
    index 34c3996..8b123f6 100644
    --- a/fs/nfs/client.c
    +++ b/fs/nfs/client.c
    @@ -849,6 +849,7 @@ #ifdef CONFIG_NFS_V4
    */
    static int nfs4_init_client(struct nfs_client *clp,
    int proto, int timeo, int retrans,
    + const char *ip_addr,
    rpc_authflavor_t authflavour)
    {
    int error;
    @@ -865,6 +866,7 @@ static int nfs4_init_client(struct nfs_c
    error = nfs_create_rpc_client(clp, proto, timeo, retrans, authflavour);
    if (error < 0)
    goto error;
    + memcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));

    error = nfs_idmap_new(clp);
    if (error < 0) {
    @@ -888,6 +890,7 @@ error:
    */
    static int nfs4_set_client(struct nfs_server *server,
    const char *hostname, const struct sockaddr_in *addr,
    + const char *ip_addr,
    rpc_authflavor_t authflavour,
    int proto, int timeo, int retrans)
    {
    @@ -902,7 +905,7 @@ static int nfs4_set_client(struct nfs_se
    error = PTR_ERR(clp);
    goto error;
    }
    - error = nfs4_init_client(clp, proto, timeo, retrans, authflavour);
    + error = nfs4_init_client(clp, proto, timeo, retrans, ip_addr, authflavour);
    if (error < 0)
    goto error_put;

    @@ -971,7 +974,7 @@ struct nfs_server *nfs4_create_server(co
    return ERR_PTR(-ENOMEM);

    /* Get a client record */
    - error = nfs4_set_client(server, hostname, addr, authflavour,
    + error = nfs4_set_client(server, hostname, addr, ip_addr, authflavour,
    data->proto, data->timeo, data->retrans);
    if (error < 0)
    goto error;
    @@ -1041,6 +1044,7 @@ struct nfs_server *nfs4_create_referral_
    /* Get a client representation.
    * Note: NFSv4 always uses TCP, */
    error = nfs4_set_client(server, data->hostname, data->addr,
    + parent_client->cl_ipaddr,
    data->authflavor,
    parent_server->client->cl_xprt->prot,
    parent_client->retrans_timeo,
    -
    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: 2006-10-19 19:11    [W:0.024 / U:93.240 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site