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 05/11] NFS: Fix NFSv4 callback regression
    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    The change in semantics for nfs_find_client() introduced by David breaks
    the NFSv4 callback channel.

    Also, replace another completely broken BUG_ON() in nfs_find_client().
    In initialised clients, clp->cl_cons_state == 0, and callers of that
    function should in any case never want to see clients that are
    uninitialised.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    ---

    fs/nfs/client.c | 19 ++++++++++++-------
    1 files changed, 12 insertions(+), 7 deletions(-)

    diff --git a/fs/nfs/client.c b/fs/nfs/client.c
    index 8b123f6..5fea638 100644
    --- a/fs/nfs/client.c
    +++ b/fs/nfs/client.c
    @@ -232,11 +232,15 @@ void nfs_put_client(struct nfs_client *c
    * Find a client by address
    * - caller must hold nfs_client_lock
    */
    -static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int nfsversion)
    +static struct nfs_client *__nfs_find_client(const struct sockaddr_in *addr, int nfsversion, int match_port)
    {
    struct nfs_client *clp;

    list_for_each_entry(clp, &nfs_client_list, cl_share_link) {
    + /* Don't match clients that failed to initialise properly */
    + if (clp->cl_cons_state < 0)
    + continue;
    +
    /* Different NFS versions cannot share the same nfs_client */
    if (clp->cl_nfsversion != nfsversion)
    continue;
    @@ -245,7 +249,7 @@ static struct nfs_client *__nfs_find_cli
    sizeof(clp->cl_addr.sin_addr)) != 0)
    continue;

    - if (clp->cl_addr.sin_port == addr->sin_port)
    + if (!match_port || clp->cl_addr.sin_port == addr->sin_port)
    goto found;
    }

    @@ -265,11 +269,12 @@ struct nfs_client *nfs_find_client(const
    struct nfs_client *clp;

    spin_lock(&nfs_client_lock);
    - clp = __nfs_find_client(addr, nfsversion);
    + clp = __nfs_find_client(addr, nfsversion, 0);
    spin_unlock(&nfs_client_lock);
    -
    - BUG_ON(clp && clp->cl_cons_state == 0);
    -
    + if (clp != NULL && clp->cl_cons_state != NFS_CS_READY) {
    + nfs_put_client(clp);
    + clp = NULL;
    + }
    return clp;
    }

    @@ -292,7 +297,7 @@ static struct nfs_client *nfs_get_client
    do {
    spin_lock(&nfs_client_lock);

    - clp = __nfs_find_client(addr, nfsversion);
    + clp = __nfs_find_client(addr, nfsversion, 1);
    if (clp)
    goto found_client;
    if (new)
    -
    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:13    [W:0.047 / U:30.924 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site