lkml.org 
[lkml]   [2011]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 15/16] sunrpc: remove global init_rpc_pipefs
    Date
    Replace remaining init_rpc_pipefs references with get_rpc_pipefs(NULL)
    and make init_rpc_pipefs static.

    Signed-off-by: Kirill A. Shutemov <kas@openvz.org>
    ---
    fs/nfsd/nfs4callback.c | 5 ++++-
    fs/nfsd/nfssvc.c | 16 ++++++++++++++--
    include/linux/sunrpc/rpc_pipe_fs.h | 2 --
    net/sunrpc/rpc_pipe.c | 1 -
    4 files changed, 18 insertions(+), 6 deletions(-)

    diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
    index 9bec643..61210b6 100644
    --- a/fs/nfsd/nfs4callback.c
    +++ b/fs/nfsd/nfs4callback.c
    @@ -647,7 +647,6 @@ int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn)
    .version = 0,
    .authflavor = clp->cl_flavor,
    .flags = (RPC_CLNT_CREATE_NOPING | RPC_CLNT_CREATE_QUIET),
    - .rpcmount = init_rpc_pipefs,
    };
    struct rpc_clnt *client;

    @@ -663,8 +662,12 @@ int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn)
    args.prognumber = clp->cl_cb_session->se_cb_prog;
    args.protocol = XPRT_TRANSPORT_BC_TCP;
    }
    + args.rpcmount = get_rpc_pipefs(NULL);
    + if (IS_ERR(args.rpcmount))
    + return PTR_ERR(args.rpcmount);
    /* Create RPC client */
    client = rpc_create(&args);
    + mntput(args.rpcmount);
    if (IS_ERR(client)) {
    dprintk("NFSD: couldn't create callback client: %ld\n",
    PTR_ERR(client));
    diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c
    index 17d78d3..7353420 100644
    --- a/fs/nfsd/nfssvc.c
    +++ b/fs/nfsd/nfssvc.c
    @@ -206,6 +206,7 @@ static bool nfsd_up = false;
    static int nfsd_startup(unsigned short port, int nrservs)
    {
    int ret;
    + struct vfsmount *rpcmount;

    if (nfsd_up)
    return 0;
    @@ -220,7 +221,13 @@ static int nfsd_startup(unsigned short port, int nrservs)
    ret = nfsd_init_socks(port);
    if (ret)
    goto out_racache;
    - ret = lockd_up(init_rpc_pipefs);
    + rpcmount = get_rpc_pipefs(NULL);
    + if (IS_ERR(rpcmount)) {
    + ret = PTR_ERR(rpcmount);
    + goto out_racache;
    + }
    + ret = lockd_up(rpcmount);
    + mntput(rpcmount);
    if (ret)
    goto out_racache;
    ret = nfs4_state_start();
    @@ -308,6 +315,7 @@ static void set_max_drc(void)
    int nfsd_create_serv(void)
    {
    int err = 0;
    + struct vfsmount *rpcmount;

    WARN_ON(!mutex_is_locked(&nfsd_mutex));
    if (nfsd_serv) {
    @@ -332,9 +340,13 @@ int nfsd_create_serv(void)
    }
    nfsd_reset_versions();

    - nfsd_serv = svc_create_pooled(&nfsd_program, init_rpc_pipefs,
    + rpcmount = get_rpc_pipefs(NULL);
    + if (IS_ERR(rpcmount))
    + return PTR_ERR(rpcmount);
    + nfsd_serv = svc_create_pooled(&nfsd_program, rpcmount,
    nfsd_max_blksize, nfsd_last_thread, nfsd,
    THIS_MODULE);
    + mntput(rpcmount);
    if (nfsd_serv == NULL)
    return -ENOMEM;

    diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h
    index 4a8830a..a0b9c46 100644
    --- a/include/linux/sunrpc/rpc_pipe_fs.h
    +++ b/include/linux/sunrpc/rpc_pipe_fs.h
    @@ -44,8 +44,6 @@ RPC_I(struct inode *inode)
    return container_of(inode, struct rpc_inode, vfs_inode);
    }

    -extern struct vfsmount *init_rpc_pipefs;
    -
    extern struct vfsmount *get_rpc_pipefs(const char *path);
    extern int rpc_pipefs_add_destroy_cb(struct super_block *sb,
    void (*destroy_cb)(void *data), void *data);
    diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c
    index 02416f1..96973c0 100644
    --- a/net/sunrpc/rpc_pipe.c
    +++ b/net/sunrpc/rpc_pipe.c
    @@ -33,7 +33,6 @@
    #include <linux/sunrpc/cache.h>

    struct vfsmount *init_rpc_pipefs __read_mostly;
    -EXPORT_SYMBOL_GPL(init_rpc_pipefs);

    static struct file_system_type rpc_pipe_fs_type;

    --
    1.7.3.4


    \
     
     \ /
      Last update: 2011-01-14 14:53    [W:0.030 / U:29.640 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site