NFS: Create an alloc_client rpc_op

This gives NFS v4 a way to set up callbacks and sessions without v2 or
v3 having to do them as well.

Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 82cb8a386a8f4b824a778b08ad71ad3dd5046b2d..254719c4a5757495144f35e2ce6b0d931f0b6fc2 100644 (file)
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -147,7 +147,7 @@ struct nfs_client_initdata {
  * Since these are allocated/deallocated very rarely, we don't
  * bother putting them in a slab cache...
  */
-static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)
+struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_init)
 {
        struct nfs_client *clp;
        struct rpc_cred *cred;
@@ -177,18 +177,6 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
        clp->cl_proto = cl_init->proto;
        clp->cl_net = get_net(cl_init->net);
 
-#ifdef CONFIG_NFS_V4
-       err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);
-       if (err)
-               goto error_cleanup;
-
-       spin_lock_init(&clp->cl_lock);
-       INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
-       rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
-       clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
-       clp->cl_minorversion = cl_init->minorversion;
-       clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];
-#endif
        cred = rpc_lookup_machine_cred("*");
        if (!IS_ERR(cred))
                clp->cl_machine_cred = cred;
@@ -218,6 +206,30 @@ static void nfs4_shutdown_session(struct nfs_client *clp)
 }
 #endif /* CONFIG_NFS_V4_1 */
 
+struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init)
+{
+       int err;
+       struct nfs_client *clp = nfs_alloc_client(cl_init);
+       if (IS_ERR(clp))
+               return clp;
+
+       err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);
+       if (err)
+               goto error;
+
+       spin_lock_init(&clp->cl_lock);
+       INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
+       rpc_init_wait_queue(&clp->cl_rpcwaitq, "NFS client");
+       clp->cl_state = 1 << NFS4CLNT_LEASE_EXPIRED;
+       clp->cl_minorversion = cl_init->minorversion;
+       clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];
+       return clp;
+
+error:
+       kfree(clp);
+       return ERR_PTR(err);
+}
+
 /*
  * Destroy the NFS4 callback service
  */
@@ -588,7 +600,7 @@ nfs_get_client(const struct nfs_client_initdata *cl_init,
 
                spin_unlock(&nn->nfs_client_lock);
 
-               new = nfs_alloc_client(cl_init);
+               new = cl_init->rpc_ops->alloc_client(cl_init);
        } while (!IS_ERR(new));
 
        dprintk("<-- nfs_get_client() Failed to find %s (%ld)\n",

diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 93b732523342f7f5229179923571c15abe073e67..633af813984d5166a2b88e87e7033635274ac37b 100644 (file)
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -148,6 +148,7 @@ extern void nfs_umount(const struct nfs_mount_request *info);
 /* client.c */
 extern const struct rpc_program nfs_program;
 extern void nfs_clients_init(struct net *net);
+extern struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *);
 
 extern void nfs_cleanup_cb_ident_idr(struct net *);
 extern void nfs_put_client(struct nfs_client *);

diff --git a/fs/nfs/nfs3proc.c b/fs/nfs/nfs3proc.c
index 4ccb34bf1732ab73d79e4c1598767943c1ab6a24..77c7aac228bb4652f82d72032a2c255988a2eadc 100644 (file)
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
@@ -934,6 +934,7 @@ const struct nfs_rpc_ops nfs_v3_clientops = {
        .close_context  = nfs_close_context,
        .have_delegation = nfs3_have_delegation,
        .return_delegation = nfs3_return_delegation,
+       .alloc_client   = nfs_alloc_client,
        .init_client    = nfs_init_client,
        .free_client    = nfs_free_client,
 };

diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
index 9889ee476e375b36be399e35f83c12fee987b47d..a0be2d1af04b2c94e8d4c2e5203b4c76a2997b87 100644 (file)
--- a/fs/nfs/nfs4_fs.h
+++ b/fs/nfs/nfs4_fs.h
@@ -303,6 +303,8 @@ extern const u32 nfs4_fs_locations_bitmap[2];
 
 void nfs4_free_client(struct nfs_client *);
 
+struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *);
+
 /* nfs4renewd.c */
 extern void nfs4_schedule_state_renewal(struct nfs_client *);
 extern void nfs4_renewd_prepare_shutdown(struct nfs_server *);

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index f301c53926b251aedf4c0eded5e455785ab0c7a1..7f39e7ecde6cec9906dd448d20de9e0d4f5be6f5 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -6806,6 +6806,7 @@ const struct nfs_rpc_ops nfs_v4_clientops = {
        .open_context   = nfs4_atomic_open,
        .have_delegation = nfs4_have_delegation,
        .return_delegation = nfs4_inode_return_delegation,
+       .alloc_client   = nfs4_alloc_client,
        .init_client    = nfs4_init_client,
        .free_client    = nfs4_free_client,
 };

diff --git a/fs/nfs/proc.c b/fs/nfs/proc.c
index 53620bf10969b6358a6c99dca75d7403b5603abb..99a002515dfeed60869b82fd533b852c7f7aca0e 100644 (file)
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
@@ -790,6 +790,7 @@ const struct nfs_rpc_ops nfs_v2_clientops = {
        .close_context  = nfs_close_context,
        .have_delegation = nfs_have_delegation,
        .return_delegation = nfs_return_delegation,
+       .alloc_client   = nfs_alloc_client,
        .init_client    = nfs_init_client,
        .free_client    = nfs_free_client,
 };

diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index e61dc7235d5d18e589bdd0502f8c1e4c07318f94..4d62b774ddaf44fabb9fdd666e7baf20f06e921d 100644 (file)
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -1353,6 +1353,7 @@ struct nfs_renamedata {
 struct nfs_access_entry;
 struct nfs_client;
 struct rpc_timeout;
+struct nfs_client_initdata;
 
 /*
  * RPC procedure vector for NFSv2/NFSv3 demuxing
@@ -1424,6 +1425,7 @@ struct nfs_rpc_ops {
                                struct iattr *iattr);
        int (*have_delegation)(struct inode *, fmode_t);
        int (*return_delegation)(struct inode *);
+       struct nfs_client *(*alloc_client) (const struct nfs_client_initdata *);
        struct nfs_client *
                (*init_client) (struct nfs_client *, const struct rpc_timeout *,
                                const char *, rpc_authflavor_t);