lkml.org 
[lkml]   [2012]   [Dec]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 1/6] nfsd: pass net to nfsd_init_socks()
    From
    Date
    Precursor patch. Hard-coded "init_net" will be replaced by proper one in
    future.

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

    diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
    index 9beace6..9fd8496 100644
    --- a/fs/nfsd/nfssvc.c
    +++ b/fs/nfsd/nfssvc.c
    @@ -182,18 +182,18 @@ int nfsd_nrthreads(void)
    return rv;
    }

    -static int nfsd_init_socks(void)
    +static int nfsd_init_socks(struct net *net)
    {
    int error;
    if (!list_empty(&nfsd_serv->sv_permsocks))
    return 0;

    - error = svc_create_xprt(nfsd_serv, "udp", &init_net, PF_INET, NFS_PORT,
    + error = svc_create_xprt(nfsd_serv, "udp", net, PF_INET, NFS_PORT,
    SVC_SOCK_DEFAULTS);
    if (error < 0)
    return error;

    - error = svc_create_xprt(nfsd_serv, "tcp", &init_net, PF_INET, NFS_PORT,
    + error = svc_create_xprt(nfsd_serv, "tcp", net, PF_INET, NFS_PORT,
    SVC_SOCK_DEFAULTS);
    if (error < 0)
    return error;
    @@ -218,7 +218,7 @@ static int nfsd_startup(int nrservs)
    ret = nfsd_racache_init(2*nrservs);
    if (ret)
    return ret;
    - ret = nfsd_init_socks();
    + ret = nfsd_init_socks(net);
    if (ret)
    goto out_racache;
    ret = lockd_up(net);


    \
     
     \ /
      Last update: 2012-12-04 21:01    [W:5.128 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site