linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: Trond.Myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
	devel@openvz.org
Subject: [PATCH v4] NFS: get client net after idr allocation
Date: Tue, 22 May 2012 18:52:56 +0400	[thread overview]
Message-ID: <20120522145154.20579.17666.stgit@localhost.localdomain> (raw)
In-Reply-To: <1337697906.4269.10.camel@lade.trondhjem.org>

Allocation can fail. So instead of put net in case of failure, get net after
allocation.

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
---
 fs/nfs/client.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index b59419a..b694971 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -172,7 +172,7 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
 	clp->cl_rpcclient = ERR_PTR(-EINVAL);
 
 	clp->cl_proto = cl_init->proto;
-	clp->net = get_net(cl_init->net);
+	clp->net = cl_init->net;
 
 #ifdef CONFIG_NFS_V4
 	err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);
@@ -187,6 +187,7 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
 	clp->cl_minorversion = cl_init->minorversion;
 	clp->cl_mvops = nfs_v4_minor_ops[cl_init->minorversion];
 #endif
+	get_net(clp->net);
 	cred = rpc_lookup_machine_cred("*");
 	if (!IS_ERR(cred))
 		clp->cl_machine_cred = cred;


  parent reply	other threads:[~2012-05-22 14:52 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-22  7:35 [PATCH v2 00/12] NFS: callback threads containerization Stanislav Kinsbursky
2012-05-22  7:35 ` [PATCH v2 01/12] NFS: pass net to nfs_callback_down() Stanislav Kinsbursky
2012-05-24 16:09   ` J. Bruce Fields
2012-05-24 19:47     ` Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 02/12] NFS: callback service creation function introduced Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 03/12] NFS: move per-net callback thread initialization to nfs_callback_up_net() Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 04/12] NFS: callback up - transport backchannel cleanup Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 05/12] NFS: callback service start function introduced Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 06/12] NFS: callback up - users counting cleanup Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 07/12] NFS: make nfs_callback_tcpport per network context Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 08/12] NFS: make nfs_callback_tcpport6 " Stanislav Kinsbursky
2012-05-22  7:36 ` [PATCH v2 09/12] NFS; callback per-net usage counting introduced Stanislav Kinsbursky
2012-05-22  7:37 ` [PATCH v2 10/12] NFS: add debug messages to callback down function Stanislav Kinsbursky
2012-05-22  7:37 ` [PATCH v2 11/12] Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Stanislav Kinsbursky
2012-05-22  8:03   ` [PATCH v3] NFS: put net on idr allocation failure Stanislav Kinsbursky
2012-05-22 14:37     ` Myklebust, Trond
2012-05-22 14:41       ` Stanislav Kinsbursky
2012-05-22 14:45         ` Myklebust, Trond
2012-05-22 14:46           ` Stanislav Kinsbursky
2012-05-22 14:52           ` Stanislav Kinsbursky [this message]
2012-05-22 14:38   ` [PATCH v2 11/12] Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Myklebust, Trond
2012-05-22 14:39     ` Stanislav Kinsbursky
2012-05-22  7:37 ` [PATCH v2 12/12] NFS: get module in idmap PipeFS notifier callback Stanislav Kinsbursky

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120522145154.20579.17666.stgit@localhost.localdomain \
    --to=skinsbursky@parallels.com \
    --cc=Trond.Myklebust@netapp.com \
    --cc=devel@openvz.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).