redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

NFS: Maintain a common server record for NFS2/3 as well as for NFS4

Browse source 
Maintain a common server record for NFS2/3 as well as for NFS4 so that common
stuff can be moved there from struct nfs_server.

Signed-Off-By: David Howells <dhowells@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
David Howells 2006-08-22 20:06:11 -04:00 committed by Trond Myklebust
parent 509de81116
commit 27951bd260
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fs/nfs/super.c
View file

@ -658,11 +658,19 @@ static void nfs_init_timeout_values(struct rpc_timeout *to, int proto, unsigned
static struct rpc_clnt * static struct rpc_clnt *
nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data) nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
{ {
struct nfs_client *clp;
struct rpc_timeout timeparms; struct rpc_timeout timeparms;
struct rpc_xprt *xprt = NULL; struct rpc_xprt *xprt = NULL;
struct rpc_clnt *clnt = NULL; struct rpc_clnt *clnt = NULL;
int proto = (data->flags & NFS_MOUNT_TCP) ? IPPROTO_TCP : IPPROTO_UDP; int proto = (data->flags & NFS_MOUNT_TCP) ? IPPROTO_TCP : IPPROTO_UDP;
clp = nfs_get_client(server->hostname, &server->addr,
server->rpc_ops->version);
if (!clp) {
dprintk("%s: failed to create NFS4 client.\n", __FUNCTION__);
return ERR_PTR(PTR_ERR(clp));
}
nfs_init_timeout_values(&timeparms, proto, data->timeo, data->retrans); nfs_init_timeout_values(&timeparms, proto, data->timeo, data->retrans);
server->retrans_timeo = timeparms.to_initval; server->retrans_timeo = timeparms.to_initval;
@ -673,6 +681,8 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
if (IS_ERR(xprt)) { if (IS_ERR(xprt)) {
dprintk("%s: cannot create RPC transport. Error = %ld\n", dprintk("%s: cannot create RPC transport. Error = %ld\n",
__FUNCTION__, PTR_ERR(xprt)); __FUNCTION__, PTR_ERR(xprt));
nfs_mark_client_ready(clp, PTR_ERR(xprt));
nfs_put_client(clp);
return (struct rpc_clnt *)xprt; return (struct rpc_clnt *)xprt;
} }
clnt = rpc_create_client(xprt, server->hostname, &nfs_program, clnt = rpc_create_client(xprt, server->hostname, &nfs_program,
@ -686,9 +696,13 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
clnt->cl_intr = 1; clnt->cl_intr = 1;
clnt->cl_softrtry = 1; clnt->cl_softrtry = 1;
nfs_mark_client_ready(clp, 0);
server->nfs_client = clp;
return clnt; return clnt;
out_fail: out_fail:
nfs_mark_client_ready(clp, PTR_ERR(xprt));
nfs_put_client(clp);
return clnt; return clnt;
} }
@ -764,6 +778,7 @@ static int nfs_clone_generic_sb(struct nfs_clone_mount *data,
if (server == NULL) if (server == NULL)
goto out_err; goto out_err;
memcpy(server, parent, sizeof(*server)); memcpy(server, parent, sizeof(*server));
atomic_inc(&server->nfs_client->cl_count);
hostname = (data->hostname != NULL) ? data->hostname : parent->hostname; hostname = (data->hostname != NULL) ? data->hostname : parent->hostname;
len = strlen(hostname) + 1; len = strlen(hostname) + 1;
server->hostname = kmalloc(len, GFP_KERNEL); server->hostname = kmalloc(len, GFP_KERNEL);
@ -796,6 +811,7 @@ out_deactivate:
out_rpciod_down: out_rpciod_down:
rpciod_down(); rpciod_down();
kfree(server->hostname); kfree(server->hostname);
nfs_put_client(server->nfs_client);
kfree(server); kfree(server);
return simple_set_mnt(mnt, sb); return simple_set_mnt(mnt, sb);
kill_rpciod: kill_rpciod:
@ -803,6 +819,7 @@ kill_rpciod:
free_hostname: free_hostname:
kfree(server->hostname); kfree(server->hostname);
free_server: free_server:
nfs_put_client(server->nfs_client);
kfree(server); kfree(server);
out_err: out_err:
return error; return error;
@ -1071,6 +1088,7 @@ static void nfs_kill_super(struct super_block *s)
nfs_free_iostats(server->io_stats); nfs_free_iostats(server->io_stats);
kfree(server->hostname); kfree(server->hostname);
nfs_put_client(server->nfs_client);
kfree(server); kfree(server);
nfs_release_automount_timer(); nfs_release_automount_timer();
} }
@ -1421,7 +1439,6 @@ static struct super_block *nfs4_clone_sb(struct nfs_server *server, struct nfs_c
nfs4_server_capabilities(server, &server->fh); nfs4_server_capabilities(server, &server->fh);
down_write(&clp->cl_sem); down_write(&clp->cl_sem);
atomic_inc(&clp->cl_count);
list_add_tail(&server->nfs4_siblings, &clp->cl_superblocks); list_add_tail(&server->nfs4_siblings, &clp->cl_superblocks);
up_write(&clp->cl_sem); up_write(&clp->cl_sem);
return sb; return sb;
@ -1476,6 +1493,8 @@ static struct nfs_server *nfs4_referral_server(struct super_block *sb, struct nf
retrans = 1; retrans = 1;
nfs_init_timeout_values(&timeparms, proto, timeo, retrans); nfs_init_timeout_values(&timeparms, proto, timeo, retrans);
nfs_put_client(server->nfs_client);
server->nfs_client = NULL;
server->client = nfs4_create_client(server, &timeparms, proto, data->authflavor); server->client = nfs4_create_client(server, &timeparms, proto, data->authflavor);
if (IS_ERR((err = server->client))) if (IS_ERR((err = server->client)))
goto out_err; goto out_err;

2
include/linux/nfs_fs_sb.h
View file

@ -70,6 +70,7 @@ struct nfs_client {
* NFS client parameters stored in the superblock. * NFS client parameters stored in the superblock.
*/ */
struct nfs_server { struct nfs_server {
struct nfs_client * nfs_client; /* shared client and NFS4 state */
struct rpc_clnt * client; /* RPC client handle */ struct rpc_clnt * client; /* RPC client handle */
struct rpc_clnt * client_sys; /* 2nd handle for FSINFO */ struct rpc_clnt * client_sys; /* 2nd handle for FSINFO */
struct rpc_clnt * client_acl; /* ACL RPC client handle */ struct rpc_clnt * client_acl; /* ACL RPC client handle */
@ -103,7 +104,6 @@ struct nfs_server {
*/ */
char ip_addr[16]; char ip_addr[16];
char * mnt_path; char * mnt_path;
struct nfs_client * nfs_client; /* all NFSv4 state starts here */
struct list_head nfs4_siblings; /* List of other nfs_server structs struct list_head nfs4_siblings; /* List of other nfs_server structs
* that share the same clientid * that share the same clientid
*/ */