lkml.org 
[lkml]   [2012]   [Jun]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] rpc_pipefs: allow rpc_purge_list to take a NULL waitq pointer
    Date
    In the event that we don't have a dentry for a rpc_pipefs pipe, we still
    need to allow the queue_timeout job to clean out the queue. There's just
    no waitq to wake up in that event.

    Cc: stable@kernel.org
    Reported-by: Hans de Bruin <jmdebruin@xmsnet.nl>
    Reported-by: Joerg Platte <jplatte@naasa.net>
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    ---
    net/sunrpc/rpc_pipe.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
    index 0404047..21fde99 100644
    --- a/net/sunrpc/rpc_pipe.c
    +++ b/net/sunrpc/rpc_pipe.c
    @@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head,
    msg->errno = err;
    destroy_msg(msg);
    } while (!list_empty(head));
    - wake_up(waitq);
    +
    + if (waitq)
    + wake_up(waitq);
    }

    static void
    @@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work)
    }
    dentry = dget(pipe->dentry);
    spin_unlock(&pipe->lock);
    - if (dentry) {
    - rpc_purge_list(&RPC_I(dentry->d_inode)->waitq,
    - &free_list, destroy_msg, -ETIMEDOUT);
    - dput(dentry);
    - }
    + rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL,
    + &free_list, destroy_msg, -ETIMEDOUT);
    + dput(dentry);
    }

    ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg,
    --
    1.7.7.6


    \
     
     \ /
      Last update: 2012-06-11 17:02    [W:0.029 / U:3.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site