From: Trond Myklebust <trond.myklebust@primarydata.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v3 03/14] pNFS: Always update the layout stateid if NFS_LAYOUT_INVALID_STID is set
Date: Sun, 24 Jul 2016 17:30:48 -0400 [thread overview]
Message-ID: <1469395859-83194-4-git-send-email-trond.myklebust@primarydata.com> (raw)
In-Reply-To: <1469395859-83194-3-git-send-email-trond.myklebust@primarydata.com>
If the layout stateid is invalid, then pnfs_set_layout_stateid() must
always initialise it.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
fs/nfs/pnfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c
index dcccded1aeed..eef844785bc6 100644
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
@@ -762,7 +762,7 @@ pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new,
bool update_barrier)
{
u32 oldseq, newseq, new_barrier;
- int empty = list_empty(&lo->plh_segs);
+ bool empty = !pnfs_layout_is_valid(lo);
oldseq = be32_to_cpu(lo->plh_stateid.seqid);
newseq = be32_to_cpu(new->seqid);
--
2.7.4
next prev parent reply other threads:[~2016-07-24 21:31 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-24 21:30 [PATCH v3 00/14] More layoutreturn nits Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 01/14] pNFS: LAYOUTRETURN should only update the stateid if the layout is valid Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 02/14] pNFS: Clear the layout return tracking on layout reinitialisation Trond Myklebust
2016-07-24 21:30 ` Trond Myklebust [this message]
2016-07-24 21:30 ` [PATCH v3 04/14] pNFS: Always update the layout barrier seqid on LAYOUTGET Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 05/14] pNFS: Fix CB_LAYOUTRECALL stateid verification Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 06/14] pNFS: Ensure layoutreturn acts as a completion for layout callbacks Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 07/14] pNFS: Do not set plh_return_seq for non-callback related layoutreturns Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 08/14] NFS: pnfs_mark_matching_lsegs_return() should match the layout sequence id Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 09/14] pNFS: Cleanup - don't open code pnfs_mark_layout_stateid_invalid() Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 10/14] pNFS: Clear the layout metadata if the server changed the layout stateid Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 11/14] pNFS: Remove redundant pnfs_mark_layout_returned_if_empty() Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 12/14] pNFS: Remove redundant stateid invalidation Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 13/14] pNFS: Cleanup - do layout segment initialisation in one place Trond Myklebust
2016-07-24 21:30 ` [PATCH v3 14/14] pNFS: Remove redundant smp_mb() from pnfs_init_lseg() Trond Myklebust
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=1469395859-83194-4-git-send-email-trond.myklebust@primarydata.com \
--to=trond.myklebust@primarydata.com \
--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).