Attachment 146027 Details for Bug 220649 – The complete patch

[patch] The complete patch

bz220649.patch (text/plain), 3.11 KB, created by Steve Dickson on 2007-01-19 20:13:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Dickson

Created: 2007-01-19 20:13:41 UTC

Size: 3.11 KB

patch

obsolete

>--- linux-2.6.18.noarch/include/linux/sunrpc/clnt.h.orig	2006-09-19 23:42:06.000000000 -0400
>+++ linux-2.6.18.noarch/include/linux/sunrpc/clnt.h	2007-01-19 15:02:29.590807000 -0500
>@@ -66,6 +66,7 @@ struct rpc_clnt {
> 	struct rpc_rtt		cl_rtt_default;
> 	struct rpc_portmap	cl_pmap_default;
> 	char			cl_inline_name[32];
>+	struct rpc_program *	cl_program;
> };
> #define cl_timeout		cl_xprt->timeout
> #define cl_prog			cl_pmap->pm_prog
>--- linux-2.6.18.noarch/net/sunrpc/clnt.c.orig	2007-01-19 15:01:51.228245000 -0500
>+++ linux-2.6.18.noarch/net/sunrpc/clnt.c	2007-01-19 15:02:47.767430000 -0500
>@@ -154,6 +154,7 @@ rpc_new_client(struct rpc_xprt *xprt, ch
> 	clnt->cl_prot     = xprt->prot;
> 	clnt->cl_stats    = program->stats;
> 	clnt->cl_metrics  = rpc_alloc_iostats(clnt);
>+	clnt->cl_program  = program;
> 	rpc_init_wait_queue(&clnt->cl_pmap_default.pm_bindwait, "bindwait");
> 
> 	if (!clnt->cl_port)
>@@ -235,6 +236,8 @@ struct rpc_clnt *
> rpc_clone_client(struct rpc_clnt *clnt)
> {
> 	struct rpc_clnt *new;
>+	struct rpc_xprt *xprt;
>+	int err;
> 
> 	new = kmalloc(sizeof(*new), GFP_KERNEL);
> 	if (!new)
>@@ -242,6 +245,36 @@ rpc_clone_client(struct rpc_clnt *clnt)
> 	memcpy(new, clnt, sizeof(*new));
> 	atomic_set(&new->cl_count, 1);
> 	atomic_set(&new->cl_users, 0);
>+	if (clnt->cl_server != clnt->cl_inline_name) {
>+		new->cl_server = kstrdup(clnt->cl_server, GFP_KERNEL);
>+		if (new->cl_server == NULL) {
>+			kfree(new);
>+			return ERR_PTR(-ENOMEM);
>+		}
>+	} else
>+		new->cl_server = new->cl_inline_name;
>+
>+	xprt = clnt->cl_xprt;
>+	new->cl_xprt = xprt_create_proto(xprt->prot, &xprt->addr, &xprt->timeout);
>+	if (IS_ERR(new->cl_xprt)) {
>+		dprintk("%s: cannot create RPC transport. Error = %ld\n",
>+				__FUNCTION__, PTR_ERR(new->cl_xprt));
>+		if (new->cl_server != new->cl_inline_name)
>+			kfree(new->cl_server);
>+		xprt = new->cl_xprt;
>+		kfree(new);
>+		return ERR_PTR(xprt);
>+	}
>+
>+	err = rpc_setup_pipedir(new, clnt->cl_program->pipe_dir_name);
>+	if (err != 0) {
>+		xprt_destroy(new->cl_xprt);
>+		if (new->cl_server != new->cl_inline_name)
>+			kfree(new->cl_server);
>+		kfree(new);
>+		return ERR_PTR(err);
>+	}
>+
> 	new->cl_parent = clnt;
> 	atomic_inc(&clnt->cl_count);
> 	/* Duplicate portmapper */
>@@ -250,8 +283,6 @@ rpc_clone_client(struct rpc_clnt *clnt)
> 	new->cl_autobind = 0;
> 	new->cl_oneshot = 0;
> 	new->cl_dead = 0;
>-	if (!IS_ERR(new->cl_dentry))
>-		dget(new->cl_dentry);
> 	rpc_init_rtt(&new->cl_rtt_default, clnt->cl_xprt->timeout.to_initval);
> 	if (new->cl_auth)
> 		atomic_inc(&new->cl_auth->au_count);
>@@ -313,12 +344,6 @@ rpc_destroy_client(struct rpc_clnt *clnt
> 		rpcauth_destroy(clnt->cl_auth);
> 		clnt->cl_auth = NULL;
> 	}
>-	if (clnt->cl_parent != clnt) {
>-		if (!IS_ERR(clnt->cl_dentry))
>-			dput(clnt->cl_dentry);
>-		rpc_destroy_client(clnt->cl_parent);
>-		goto out_free;
>-	}
> 	if (!IS_ERR(clnt->cl_dentry)) {
> 		rpc_rmdir(clnt->cl_dentry);
> 		rpc_put_mount();
>@@ -327,6 +352,10 @@ rpc_destroy_client(struct rpc_clnt *clnt
> 		xprt_destroy(clnt->cl_xprt);
> 		clnt->cl_xprt = NULL;
> 	}
>+	if (clnt->cl_parent != clnt) {
>+		rpc_destroy_client(clnt->cl_parent);
>+		goto out_free;
>+	}
> 	if (clnt->cl_server != clnt->cl_inline_name)
> 		kfree(clnt->cl_server);
> out_free:

Actions: View | Diff

Attachments on bug 220649: 146024 | 146027 | 146187