lkml.org 
[lkml]   [2010]   [Mar]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[063/156] Revert "sunrpc: move the close processing after do recvfrom method"
    2.6.33-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: J. Bruce Fields <bfields@citi.umich.edu>

    commit 1b644b6e6f6160ae35ce4b52c2ca89ed3e356e18 upstream.

    This reverts commit b0401d725334a94d57335790b8ac2404144748ee, which
    moved svc_delete_xprt() outside of XPT_BUSY, and allowed it to be called
    after svc_xpt_recived(), removing its last reference and destroying it
    after it had already been queued for future processing.

    Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/sunrpc/svc_xprt.c | 12 +++++-------
    1 file changed, 5 insertions(+), 7 deletions(-)

    --- a/net/sunrpc/svc_xprt.c
    +++ b/net/sunrpc/svc_xprt.c
    @@ -699,7 +699,10 @@ int svc_recv(struct svc_rqst *rqstp, lon
    spin_unlock_bh(&pool->sp_lock);

    len = 0;
    - if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {
    + if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) {
    + dprintk("svc_recv: found XPT_CLOSE\n");
    + svc_delete_xprt(xprt);
    + } else if (test_bit(XPT_LISTENER, &xprt->xpt_flags)) {
    struct svc_xprt *newxpt;
    newxpt = xprt->xpt_ops->xpo_accept(xprt);
    if (newxpt) {
    @@ -725,7 +728,7 @@ int svc_recv(struct svc_rqst *rqstp, lon
    svc_xprt_received(newxpt);
    }
    svc_xprt_received(xprt);
    - } else if (!test_bit(XPT_CLOSE, &xprt->xpt_flags)) {
    + } else {
    dprintk("svc: server %p, pool %u, transport %p, inuse=%d\n",
    rqstp, pool->sp_id, xprt,
    atomic_read(&xprt->xpt_ref.refcount));
    @@ -738,11 +741,6 @@ int svc_recv(struct svc_rqst *rqstp, lon
    dprintk("svc: got len=%d\n", len);
    }

    - if (test_bit(XPT_CLOSE, &xprt->xpt_flags)) {
    - dprintk("svc_recv: found XPT_CLOSE\n");
    - svc_delete_xprt(xprt);
    - }
    -
    /* No data, incomplete (TCP) read, or accept() */
    if (len == 0 || len == -EAGAIN) {
    rqstp->rq_res.len = 0;



    \
     
     \ /
      Last update: 2010-03-31 01:47    [W:2.091 / U:0.368 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site