lkml.org 
[lkml]   [2012]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[RFC PATCH 14/13] NFSd: make grace end flag per network namespace
    From
    Date
    NFSd's grace_ender flag is a part of grace period facility.

    Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
    ---
    fs/nfsd/netns.h | 1 +
    fs/nfsd/nfs4state.c | 8 +++-----
    2 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h
    index e99767d..b6deebd 100644
    --- a/fs/nfsd/netns.h
    +++ b/fs/nfsd/netns.h
    @@ -36,6 +36,7 @@ struct nfsd_net {
    struct cache_detail *nametoid_cache;

    struct lock_manager nfsd4_manager;
    + bool grace_ended;
    };

    extern int nfsd_net_id;
    diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
    index 2f940c1..7c88ee8 100644
    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -3188,19 +3188,17 @@ out:
    return status;
    }

    -static bool grace_ended;
    -
    static void
    nfsd4_end_grace(struct net *net)
    {
    struct nfsd_net *nn = net_generic(net, nfsd_net_id);

    /* do nothing if grace period already ended */
    - if (grace_ended)
    + if (nn->grace_ended)
    return;

    dprintk("NFSD: end of grace period\n");
    - grace_ended = true;
    + nn->grace_ended = true;
    nfsd4_record_grace_done(net, boot_time);
    locks_end_grace(&nn->nfsd4_manager);
    /*
    @@ -4761,7 +4759,7 @@ nfs4_state_start(void)
    nfsd4_client_tracking_init(net);
    boot_time = get_seconds();
    locks_start_grace(net, &nn->nfsd4_manager);
    - grace_ended = false;
    + nn->grace_ended = false;
    printk(KERN_INFO "NFSD: starting %ld-second grace period\n",
    nfsd4_grace);
    ret = set_callback_cred();


    \
     
     \ /
      Last update: 2012-05-14 16:01    [W:0.025 / U:60.800 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site