From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx2.netapp.com ([216.240.18.37]:61447 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933750Ab2AKSgT convert rfc822-to-8bit (ORCPT ); Wed, 11 Jan 2012 13:36:19 -0500 Message-ID: <1326306977.20284.4.camel@lade.trondhjem.org> Subject: Re: [PATCH v2 4/5] NFS: remove RPC PipeFS mount point reference from blocklayout routines From: Trond Myklebust To: Stanislav Kinsbursky Cc: linux-nfs@vger.kernel.org, xemul@parallels.com, neilb@suse.de, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jbottomley@parallels.com, bfields@fieldses.org, davem@davemloft.net, devel@openvz.org Date: Wed, 11 Jan 2012 13:36:17 -0500 In-Reply-To: <1326306793.20284.3.camel@lade.trondhjem.org> References: <20120110130323.1672.97025.stgit@localhost6.localdomain6> <20120110130440.1672.43785.stgit@localhost6.localdomain6> <1326306793.20284.3.camel@lade.trondhjem.org> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org List-ID: On Wed, 2012-01-11 at 13:33 -0500, Trond Myklebust wrote: > On Tue, 2012-01-10 at 17:04 +0400, Stanislav Kinsbursky wrote: > > This is a cleanup patch. We don't need this reference anymore, because > > blocklayout pipes dentries now creates and destroys in per-net operations and > > on PipeFS mount/umount notification. > > Note that nfs4blocklayout_register_net() now returns 0 instead of -ENOENT in > > case of PipeFS superblock absence. This is ok, because blocklayout pipe dentry > > will be created on PipeFS mount event. > > > > Signed-off-by: Stanislav Kinsbursky > > > > --- > > fs/nfs/blocklayout/blocklayout.c | 9 +-------- > > 1 files changed, 1 insertions(+), 8 deletions(-) > > > > diff --git a/fs/nfs/blocklayout/blocklayout.c b/fs/nfs/blocklayout/blocklayout.c > > index 322d920..2c70202 100644 > > --- a/fs/nfs/blocklayout/blocklayout.c > > +++ b/fs/nfs/blocklayout/blocklayout.c > > @@ -1034,7 +1034,7 @@ static struct dentry *nfs4blocklayout_register_net(struct net *net, > > > > pipefs_sb = rpc_get_sb_net(net); > > if (!pipefs_sb) > > - return ERR_PTR(-ENOENT); > > + return 0; > > This looks like a typo of some sort. The caller in > nfs4blocklayout_net_init() checks for IS_ERR(), not NULL. I'll just > remove this hunk... Never mind. I see what's going on now... It should be NULL, and not 0 for coding style reasons, though... -- Trond Myklebust Linux NFS client maintainer NetApp Trond.Myklebust@netapp.com www.netapp.com