From 50ff7d69266e9b60bdd0ca65d42be5dcee57c150 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 2 Oct 2012 16:38:41 -0700 Subject: [PATCH] --- yaml --- r: 333211 b: refs/heads/master c: 038d6493763d900797dfeb555502d3b0d8103fba h: refs/heads/master i: 333209: f1145509b1e49a741bb0b0923d4e45baa524344a 333207: dc95bb0c7e56ed1cdbc560593810013a7a889199 v: v3 --- [refs] | 2 +- trunk/fs/nfs/pnfs.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5aee3c5fdca0..f24ecb319782 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 251ec410c495cb93c7ae2cb4beda29205d9bd35f +refs/heads/master: 038d6493763d900797dfeb555502d3b0d8103fba diff --git a/trunk/fs/nfs/pnfs.c b/trunk/fs/nfs/pnfs.c index fe9968a62cad..c8c1d0cc197a 100644 --- a/trunk/fs/nfs/pnfs.c +++ b/trunk/fs/nfs/pnfs.c @@ -558,7 +558,7 @@ pnfs_set_layout_stateid(struct pnfs_layout_hdr *lo, const nfs4_stateid *new, oldseq = be32_to_cpu(lo->plh_stateid.seqid); newseq = be32_to_cpu(new->seqid); - if ((int)(newseq - oldseq) > 0) { + if (list_empty(&lo->plh_segs) || (int)(newseq - oldseq) > 0) { nfs4_stateid_copy(&lo->plh_stateid, new); if (update_barrier) { u32 new_barrier = be32_to_cpu(new->seqid); @@ -1181,6 +1181,10 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) dprintk("%s forget reply due to state\n", __func__); goto out_forget_reply; } + + /* Done processing layoutget. Set the layout stateid */ + pnfs_set_layout_stateid(lo, &res->stateid, false); + init_lseg(lo, lseg); lseg->pls_range = res->range; pnfs_get_lseg(lseg); @@ -1191,8 +1195,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp) set_bit(NFS_LAYOUT_ROC, &lo->plh_flags); } - /* Done processing layoutget. Set the layout stateid */ - pnfs_set_layout_stateid(lo, &res->stateid, false); spin_unlock(&ino->i_lock); return lseg; out: