From: Trond Myklebust <trond.myklebust@primarydata.com>
Date: Sun, 24 Jul 2016 15:39:03 +0000 (-0400)
Subject: pNFS: Always update the layout stateid if NFS_LAYOUT_INVALID_STID is set
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=13bede18de41e2cfe8f67c1cd8b6d10be42ef473;p=linux-beck.git

pNFS: Always update the layout stateid if NFS_LAYOUT_INVALID_STID is set

If the layout stateid is invalid, then pnfs_set_layout_stateid() must
always initialise it.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---

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);