From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stanislav Kinsbursky Subject: Re: [PATCH 4/4] NFS: make nfs_client_lock per net ns Date: Tue, 07 Feb 2012 18:09:15 +0400 Message-ID: <4F31308B.1090002@parallels.com> References: <20120123172631.29637.17188.stgit@localhost6.localdomain6> <1328622659.4124.3.camel@lade.trondhjem.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: "linux-nfs@vger.kernel.org" , Pavel Emelianov , "neilb@suse.de" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , James Bottomley , "bfields@fieldses.org" , "davem@davemloft.net" , "devel@openvz.org" To: "Myklebust, Trond" Return-path: In-Reply-To: <1328622659.4124.3.camel@lade.trondhjem.org> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org 07.02.2012 17:51, Myklebust, Trond =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > 8<-------------------------------------------------------------------= ------ > From 5a489156da4fd15dd143f2b21dd9657b97dcef88 Mon Sep 17 00:00:00 20= 01 > From: Trond Myklebust > Date: Tue, 7 Feb 2012 00:05:11 -0500 > Subject: [PATCH] NFS: Initialise the nfs_net->nfs_client_lock > > Ensure that we initialise the nfs_net->nfs_client_lock spinlock. > Also ensure that nfs_server_remove_lists() doesn't try to > dereference server->nfs_client before that is initialised. > Sorry. Patch looks nice. Except one notice below. > Signed-off-by: Trond Myklebust > Cc: Stanislav Kinsbursky > --- > fs/nfs/client.c | 6 +++++- > 1 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/fs/nfs/client.c b/fs/nfs/client.c > index 1a5cd49..f0dacad 100644 > --- a/fs/nfs/client.c > +++ b/fs/nfs/client.c > @@ -1055,8 +1055,11 @@ static void nfs_server_insert_lists(struct nfs= _server *server) > static void nfs_server_remove_lists(struct nfs_server *server) > { > struct nfs_client *clp =3D server->nfs_client; > - struct nfs_net *nn =3D net_generic(clp->net, nfs_net_id); > + struct nfs_net *nn; > > + if (clp =3D=3D NULL) > + return; > + nn =3D net_generic(clp->net, nfs_net_id); > spin_lock(&nn->nfs_client_lock); > list_del_rcu(&server->client_link); > if (clp&& list_empty(&clp->cl_superblocks)) This check for clp !=3D NULL can be removed. --=20 Best regards, Stanislav Kinsbursky