From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: Tom Haynes <thomas.haynes@primarydata.com>,
Anna Schumaker <Anna.Schumaker@netapp.com>
Cc: Trond Myklebust <Trond.Myklebust@primarydata.com>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH 39/50] nfs/flexfiles: send layoutreturn before freeing lseg
Date: Wed, 17 Dec 2014 09:44:13 -0500 [thread overview]
Message-ID: <549196BD.5090501@Netapp.com> (raw)
In-Reply-To: <20141216220258.GE95519@kitty>
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 <tao.peng@primarydata.com>
>>>
>>> Otherwise we'll lose error tracking information when
>>> encoding layoutreturn.
>>>
>>> Signed-off-by: Peng Tao <tao.peng@primarydata.com>
>>> Signed-off-by: Tom Haynes <loghyr@primarydata.com>
>>> ---
>>> 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
>
next prev parent reply other threads:[~2014-12-17 14:44 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-16 19:01 [PATCH 00/50] *** Add Flexfile Layout Module *** Tom Haynes
2014-12-16 19:01 ` [PATCH 01/50] pnfs: Prepare for flexfiles by pulling out common code Tom Haynes
2014-12-16 19:56 ` Anna Schumaker
2014-12-16 20:32 ` Tom Haynes
2014-12-16 20:35 ` Tom Haynes
2014-12-16 19:01 ` [PATCH 02/50] pnfs: Do not grab the commit_info lock twice when rescheduling writes Tom Haynes
2014-12-16 19:01 ` [PATCH 03/50] nfs41: pull data server cache from file layout to generic pnfs Tom Haynes
2014-12-16 19:01 ` [PATCH 04/50] nfs41: pull nfs4_ds_connect " Tom Haynes
2014-12-16 19:01 ` [PATCH 05/50] nfs41: pull decode_ds_addr " Tom Haynes
2014-12-16 19:01 ` [PATCH 06/50] nfs41: allow LD to choose DS connection auth flavor Tom Haynes
2014-12-16 19:01 ` [PATCH 07/50] nfs41: move file layout macros to generic pnfs Tom Haynes
2014-12-16 19:01 ` [PATCH 08/50] nfsv3: introduce nfs3_set_ds_client Tom Haynes
2014-12-16 20:35 ` Anna Schumaker
2014-12-16 21:55 ` Tom Haynes
2014-12-22 2:22 ` Peng Tao
2014-12-16 19:01 ` [PATCH 09/50] nfs41: allow LD to choose DS connection version/minor_version Tom Haynes
2014-12-16 19:01 ` [PATCH 10/50] nfs41: create NFSv3 DS connection if specified Tom Haynes
2014-12-16 19:01 ` [PATCH 11/50] pnfs: Add nfs_rpc_ops in calls to nfs_initiate_pgio Tom Haynes
2014-12-16 19:01 ` [PATCH 12/50] nfs: allow different protocol in nfs_initiate_commit Tom Haynes
2014-12-16 19:01 ` [PATCH 13/50] nfs4: pass slot table to nfs40_setup_sequence Tom Haynes
2014-12-16 19:01 ` [PATCH 14/50] nfs4: export nfs4_sequence_done Tom Haynes
2014-12-16 19:01 ` [PATCH 15/50] nfs: allow to specify cred in nfs_initiate_pgio Tom Haynes
2014-12-16 19:01 ` [PATCH 16/50] NFSv4.1/NFSv3: Add pNFS callbacks for nfs3_(read|write|commit)_done() Tom Haynes
2014-12-16 19:01 ` [PATCH 17/50] sunrpc: add rpc_count_iostats_idx Tom Haynes
2014-12-16 19:01 ` [PATCH 18/50] nfs: set hostname when creating nfsv3 ds connection Tom Haynes
2014-12-16 19:01 ` [PATCH 19/50] nfs/flexclient: export pnfs_layoutcommit_inode Tom Haynes
2014-12-16 19:01 ` [PATCH 20/50] nfs41: close a small race window when adding new layout to global list Tom Haynes
2014-12-16 19:01 ` [PATCH 21/50] nfs41: serialize first layoutget of a file Tom Haynes
2014-12-16 19:01 ` [PATCH 22/50] nfs: save server READ/WRITE/COMMIT status Tom Haynes
2014-12-16 19:01 ` [PATCH 23/50] nfs41: pass iomode through layoutreturn args Tom Haynes
2014-12-16 19:01 ` [PATCH 24/50] nfs41: make a helper function to send layoutreturn Tom Haynes
2014-12-16 19:01 ` [PATCH 25/50] nfs41: add a helper to mark layout for return Tom Haynes
2014-12-16 19:01 ` [PATCH 26/50] nfs41: don't use a layout if it is marked for returning Tom Haynes
2014-12-16 19:01 ` [PATCH 27/50] nfs41: send layoutreturn in last put_lseg Tom Haynes
2014-12-16 19:01 ` [PATCH 28/50] nfs41: clear NFS_LAYOUT_RETURN if layoutreturn is sent or failed to send Tom Haynes
2014-12-16 19:01 ` [PATCH 29/50] nfs/filelayout: use pnfs_error_mark_layout_for_return Tom Haynes
2014-12-16 19:01 ` [PATCH 30/50] nfs: introduce pg_cleanup op for pgio descriptors Tom Haynes
2014-12-16 19:01 ` [PATCH 31/50] pnfs: release lseg in pnfs_generic_pg_cleanup Tom Haynes
2014-12-16 19:01 ` [PATCH 32/50] nfs: handle overlapping reqs in lock_and_join Tom Haynes
2014-12-16 19:01 ` [PATCH 33/50] nfs: rename pgio header ds_idx to ds_commit_idx Tom Haynes
2014-12-16 19:01 ` [PATCH 34/50] pnfs: pass ds_commit_idx through the commit path Tom Haynes
2014-12-16 19:01 ` [PATCH 35/50] nfs: add mirroring support to pgio layer Tom Haynes
2014-12-16 19:01 ` [PATCH 36/50] nfs: mirroring support for direct io Tom Haynes
2014-12-16 19:01 ` [PATCH 37/50] pnfs: fail comparison when bucket verifier not set Tom Haynes
2014-12-16 19:01 ` [PATCH 38/50] nfs41: add a debug warning if we destroy an unempty layout Tom Haynes
2014-12-16 21:03 ` Anna Schumaker
2014-12-22 2:06 ` Peng Tao
2014-12-16 19:01 ` [PATCH 39/50] nfs/flexfiles: send layoutreturn before freeing lseg Tom Haynes
2014-12-16 21:12 ` Anna Schumaker
2014-12-16 22:02 ` Tom Haynes
2014-12-17 14:44 ` Anna Schumaker [this message]
2014-12-16 19:01 ` [PATCH 40/50] nfs: only reset desc->pg_mirror_idx when mirroring is supported Tom Haynes
2014-12-16 19:01 ` [PATCH 41/50] nfs: add nfs_pgio_current_mirror helper Tom Haynes
2014-12-16 19:01 ` [PATCH 42/50] pnfs: allow LD to ask to resend read through pnfs Tom Haynes
2014-12-16 19:01 ` [PATCH 43/50] nfs41: add range to layoutreturn args Tom Haynes
2014-12-16 19:01 ` [PATCH 44/50] nfs41: allow async version layoutreturn Tom Haynes
2014-12-16 19:01 ` [PATCH 45/50] nfs41: introduce NFS_LAYOUT_RETURN_BEFORE_CLOSE Tom Haynes
2014-12-16 19:01 ` [PATCH 46/50] nfs/flexfiles: defer sending layoutreturn in pnfs_put_lseg Tom Haynes
2014-12-16 19:01 ` [PATCH 47/50] nfs41: add NFS_LAYOUT_RETRY_LAYOUTGET to layout header flags Tom Haynes
2014-12-16 19:01 ` [PATCH 48/50] nfs: add a helper to set NFS_ODIRECT_RESCHED_WRITES to direct writes Tom Haynes
2014-12-16 19:01 ` [PATCH 49/50] nfs41: wait for LAYOUTRETURN before retrying LAYOUTGET Tom Haynes
2014-12-16 19:01 ` [PATCH 50/50] pnfs/flexfiles: Add the FlexFile Layout Driver Tom Haynes
2014-12-16 19:36 ` [PATCH 00/50] *** Add Flexfile Layout Module *** Anna Schumaker
2014-12-16 20:33 ` Tom Haynes
2014-12-16 20:48 ` Tom Haynes
2014-12-16 20:40 ` J. Bruce Fields
2014-12-16 20:45 ` Tom Haynes
2014-12-16 20:53 ` Anna Schumaker
2014-12-16 21:03 ` Tom Haynes
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=549196BD.5090501@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=Trond.Myklebust@primarydata.com \
--cc=linux-nfs@vger.kernel.org \
--cc=thomas.haynes@primarydata.com \
/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