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 v2 11/12] Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Date: Tue, 22 May 2012 11:37:09 +0400 [thread overview]
Message-ID: <20120522073709.20602.33027.stgit@localhost.localdomain> (raw)
In-Reply-To: <20120522073320.20602.87130.stgit@localhost.localdomain>
From: root (none) <root@sighted>
---
fs/nfs/client.c | 4 +++-
fs/nfs/idmap.c | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 44cd70f..ae29d4f 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -176,8 +176,10 @@ static struct nfs_client *nfs_alloc_client(const struct nfs_client_initdata *cl_
#ifdef CONFIG_NFS_V4
err = nfs_get_cb_ident_idr(clp, cl_init->minorversion);
- if (err)
+ if (err) {
+ put_net(clp->net);
goto error_cleanup;
+ }
spin_lock_init(&clp->cl_lock);
INIT_DELAYED_WORK(&clp->cl_renewd, nfs4_renew_state);
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c
index b7f348b..c9c3e1b 100644
--- a/fs/nfs/idmap.c
+++ b/fs/nfs/idmap.c
@@ -487,7 +487,7 @@ nfs_idmap_delete(struct nfs_client *clp)
kfree(idmap);
}
-static int __rpc_pipefs_event(struct nfs_client *clp, unsigned long event,
+static noinline int __rpc_pipefs_event(struct nfs_client *clp, unsigned long event,
struct super_block *sb)
{
int err = 0;
@@ -533,8 +533,11 @@ static struct nfs_client *nfs_get_client_for_event(struct net *net, int event)
spin_lock(&nn->nfs_client_lock);
list_for_each_entry(clp, &nn->nfs_client_list, cl_share_link) {
+ BUG_ON(atomic_read(&clp->cl_count) == 0);
if (clp->rpc_ops != &nfs_v4_clientops)
continue;
+ BUG_ON(clp->cl_idmap == NULL);
+ BUG_ON(clp->cl_idmap->idmap_pipe == NULL);
cl_dentry = clp->cl_idmap->idmap_pipe->dentry;
if (((event == RPC_PIPEFS_MOUNT) && cl_dentry) ||
((event == RPC_PIPEFS_UMOUNT) && !cl_dentry))
next prev parent reply other threads:[~2012-05-22 7:37 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 ` Stanislav Kinsbursky [this message]
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 ` [PATCH v4] NFS: get client net after idr allocation Stanislav Kinsbursky
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=20120522073709.20602.33027.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).