Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx12.netapp.com ([216.240.18.77]:64553 "EHLO mx12.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750979AbaLQOoS (ORCPT ); Wed, 17 Dec 2014 09:44:18 -0500 Message-ID: <549196BD.5090501@Netapp.com> Date: Wed, 17 Dec 2014 09:44:13 -0500 From: Anna Schumaker MIME-Version: 1.0 To: Tom Haynes , Anna Schumaker CC: Trond Myklebust , Linux NFS Mailing List Subject: Re: [PATCH 39/50] nfs/flexfiles: send layoutreturn before freeing lseg References: <1418756513-95187-1-git-send-email-loghyr@primarydata.com> <1418756513-95187-40-git-send-email-loghyr@primarydata.com> <5490A020.1060000@Netapp.com> <20141216220258.GE95519@kitty> In-Reply-To: <20141216220258.GE95519@kitty> Content-Type: text/plain; charset="utf-8" Sender: linux-nfs-owner@vger.kernel.org List-ID: On 12/16/2014 05:02 PM, Tom Haynes wrote: > On Tue, Dec 16, 2014 at 04:12:00PM -0500, Anna Schumaker wrote: >> On 12/16/2014 02:01 PM, Tom Haynes wrote: >>> From: Peng Tao >>> >>> Otherwise we'll lose error tracking information when >>> encoding layoutreturn. >>> >>> Signed-off-by: Peng Tao >>> Signed-off-by: Tom Haynes >>> --- >>> fs/nfs/pnfs.c | 19 +++++++++++++------ >>> 1 file changed, 13 insertions(+), 6 deletions(-) >>> >>> diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c >>> index e123cfc..35465cb 100644 >>> --- a/fs/nfs/pnfs.c >>> +++ b/fs/nfs/pnfs.c >>> @@ -355,7 +355,7 @@ pnfs_layout_need_return(struct pnfs_layout_hdr *lo, >>> return false; >>> >>> list_for_each_entry(s, &lo->plh_segs, pls_list) >>> - if (test_bit(NFS_LSEG_LAYOUTRETURN, &lseg->pls_flags)) >>> + if (s != lseg && test_bit(NFS_LSEG_LAYOUTRETURN, &s->pls_flags)) >>> return false; >>> >>> *stateid = lo->plh_stateid; >>> @@ -386,15 +386,22 @@ pnfs_put_lseg(struct pnfs_layout_segment *lseg) >>> enum pnfs_iomode iomode; >>> >>> pnfs_get_layout_hdr(lo); >>> - pnfs_layout_remove_lseg(lo, lseg); >>> need_return = pnfs_layout_need_return(lo, lseg, >>> &stateid, &iomode); >>> - spin_unlock(&inode->i_lock); >>> - pnfs_free_lseg(lseg); >>> - if (need_return) >>> + if (need_return) { >>> + spin_unlock(&inode->i_lock); >>> + /* hdr reference dropped in nfs4_layoutreturn_release */ >>> pnfs_send_layoutreturn(lo, stateid, iomode); >>> - else >>> + spin_lock(&inode->i_lock); >>> + pnfs_layout_remove_lseg(lo, lseg); >>> + spin_unlock(&inode->i_lock); >>> + pnfs_free_lseg(lseg); >>> + } else { >>> + pnfs_layout_remove_lseg(lo, lseg); >>> + spin_unlock(&inode->i_lock); >>> + pnfs_free_lseg(lseg); >>> pnfs_put_layout_hdr(lo); >>> + } >> >> Is there a way to rephrase this so we're not using every other line to either lock or unlock? > > Hi Anna, > > This patch: > > [PATCH 46/50] nfs/flexfiles: defer sending layoutreturn in pnfs_put_lseg > > does do just that. > > I could look at consolidating the two patches such that we don't see this ugliness. Please do! Anna > > Thanks, > Tom > >> >> Anna >> >>> } >>> } >>> EXPORT_SYMBOL_GPL(pnfs_put_lseg); >>> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-nfs" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >