From: Stanislav Kinsbursky <skinsbursky@parallels.com>
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, Trond.Myklebust@netapp.com,
linux-kernel@vger.kernel.org, devel@openvz.org
Subject: [PATCH v3 11/11] NFS: get net after idr allocation
Date: Tue, 03 Jul 2012 20:20:44 +0400 [thread overview]
Message-ID: <20120703162044.11911.6064.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120703161844.11911.92996.stgit@localhost.localdomain>
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 d8c918b..d17aa10 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -175,7 +175,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->cl_net = get_net(cl_init->net);
+ clp->cl_net = cl_init->net;
#ifdef CONFIG_NFS_V4
err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);
@@ -189,6 +189,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->cl_net);
cred = rpc_lookup_machine_cred("*");
if (!IS_ERR(cred))
clp->cl_machine_cred = cred;
next prev parent reply other threads:[~2012-07-03 16:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-03 16:19 [PATCH v3 00/11] Series short description Stanislav Kinsbursky
2012-07-03 16:19 ` [PATCH v3 01/11] NFS: pass net to nfs_callback_down() Stanislav Kinsbursky
2012-07-03 16:19 ` [PATCH v3 02/11] NFS: callback service creation function introduced Stanislav Kinsbursky
2012-07-03 16:19 ` [PATCH v3 03/11] NFS: move per-net callback thread initialization to nfs_callback_up_net() Stanislav Kinsbursky
2012-07-24 21:47 ` J. Bruce Fields
2012-07-25 10:18 ` Stanislav Kinsbursky
2012-07-25 10:46 ` Stanislav Kinsbursky
2012-07-03 16:19 ` [PATCH v3 04/11] NFS: callback up - transport backchannel cleanup Stanislav Kinsbursky
2012-07-03 16:20 ` [PATCH v3 05/11] NFS: callback service start function introduced Stanislav Kinsbursky
2012-07-03 16:20 ` [PATCH v3 06/11] NFS: callback up - users counting cleanup Stanislav Kinsbursky
2012-07-03 16:20 ` [PATCH v3 07/11] NFS: make nfs_callback_tcpport per network context Stanislav Kinsbursky
2012-07-03 16:20 ` [PATCH v3 08/11] NFS: make nfs_callback_tcpport6 " Stanislav Kinsbursky
2012-07-03 16:20 ` [PATCH v3 09/11] NFS; callback per-net usage counting introduced Stanislav Kinsbursky
2012-07-03 16:20 ` [PATCH v3 10/11] NFS: add debug messages to callback down function Stanislav Kinsbursky
2012-07-03 16:20 ` Stanislav Kinsbursky [this message]
2012-07-24 22:36 ` [PATCH v3 00/11] Series short description J. Bruce Fields
2012-07-25 10:34 ` Stanislav Kinsbursky
2012-08-20 12:57 ` 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=20120703162044.11911.6064.stgit@localhost.localdomain \
--to=skinsbursky@parallels.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bfields@fieldses.org \
--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).