lkml.org 
[lkml]   [2012]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH v3 01/11] NFS: pass net to nfs_callback_down()
    From
    Date
    Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
    ---
    fs/nfs/callback.c | 4 ++--
    fs/nfs/callback.h | 2 +-
    fs/nfs/client.c | 2 +-
    3 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c
    index 23ff18f..2d3019d 100644
    --- a/fs/nfs/callback.c
    +++ b/fs/nfs/callback.c
    @@ -321,7 +321,7 @@ out_err:
    /*
    * Kill the callback thread if it's no longer being used.
    */
    -void nfs_callback_down(int minorversion)
    +void nfs_callback_down(int minorversion, struct net *net)
    {
    struct nfs_callback_data *cb_info = &nfs_callback_info[minorversion];

    @@ -329,7 +329,7 @@ void nfs_callback_down(int minorversion)
    cb_info->users--;
    if (cb_info->users == 0 && cb_info->task != NULL) {
    kthread_stop(cb_info->task);
    - svc_shutdown_net(cb_info->serv, &init_net);
    + svc_shutdown_net(cb_info->serv, net);
    svc_exit_thread(cb_info->rqst);
    cb_info->serv = NULL;
    cb_info->rqst = NULL;
    diff --git a/fs/nfs/callback.h b/fs/nfs/callback.h
    index a5527c9..6d900cf 100644
    --- a/fs/nfs/callback.h
    +++ b/fs/nfs/callback.h
    @@ -194,7 +194,7 @@ extern __be32 nfs4_callback_recall(struct cb_recallargs *args, void *dummy,
    struct cb_process_state *cps);
    #ifdef CONFIG_NFS_V4
    extern int nfs_callback_up(u32 minorversion, struct rpc_xprt *xprt);
    -extern void nfs_callback_down(int minorversion);
    +extern void nfs_callback_down(int minorversion, struct net *net);
    extern int nfs4_validate_delegation_stateid(struct nfs_delegation *delegation,
    const nfs4_stateid *stateid);
    extern int nfs4_set_callback_sessionid(struct nfs_client *clp);
    diff --git a/fs/nfs/client.c b/fs/nfs/client.c
    index 17ba6b9..28bc770 100644
    --- a/fs/nfs/client.c
    +++ b/fs/nfs/client.c
    @@ -225,7 +225,7 @@ static void nfs4_shutdown_session(struct nfs_client *clp)
    static void nfs4_destroy_callback(struct nfs_client *clp)
    {
    if (__test_and_clear_bit(NFS_CS_CALLBACK, &clp->cl_res_state))
    - nfs_callback_down(clp->cl_mvops->minor_version);
    + nfs_callback_down(clp->cl_mvops->minor_version, &init_net);
    }

    static void nfs4_shutdown_client(struct nfs_client *clp)


    \
     
     \ /
      Last update: 2012-07-03 19:01    [W:0.023 / U:7.904 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site