lkml.org 
[lkml]   [2012]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[34-longterm 104/196] NFSv4.1: Ensure state manager thread dies on last umount
    Date
    From: Trond Myklebust <Trond.Myklebust@netapp.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 47c2199b6eb5fbe38ddb844db7cdbd914d304f9c upstream.

    Currently, the state manager may continue to try recovering state forever
    even after the last filesystem to reference that nfs_client has umounted.

    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    fs/nfs/nfs4state.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
    index 6c5ed51..c03bdcc 100644
    --- a/fs/nfs/nfs4state.c
    +++ b/fs/nfs/nfs4state.c
    @@ -1399,7 +1399,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
    int status = 0;

    /* Ensure exclusive access to NFSv4 state */
    - for(;;) {
    + do {
    if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
    /* We're going to have to re-establish a clientid */
    status = nfs4_reclaim_lease(clp);
    @@ -1482,7 +1482,7 @@ static void nfs4_state_manager(struct nfs_client *clp)
    break;
    if (test_and_set_bit(NFS4CLNT_MANAGER_RUNNING, &clp->cl_state) != 0)
    break;
    - }
    + } while (atomic_read(&clp->cl_count) > 1);
    return;
    out_error:
    printk(KERN_WARNING "Error: state manager failed on NFSv4 server %s"
    --
    1.7.9.3


    \
     
     \ /
      Last update: 2012-03-13 01:55    [W:0.042 / U:0.168 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site