android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NFSv4.1: Always set the layout stateid if this is the first layoutget

Browse Source 
If the list of layout segments is empty, we must unconditionally set
the layout stateid.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2012-10-02 16:38:41 -07:00
parent 251ec410c4
commit 038d649376
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfs/pnfs.c
View File

@ -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); oldseq = be32_to_cpu(lo->plh_stateid.seqid);
newseq = be32_to_cpu(new->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); nfs4_stateid_copy(&lo->plh_stateid, new);
if (update_barrier) { if (update_barrier) {
u32 new_barrier = be32_to_cpu(new->seqid); 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__); dprintk("%s forget reply due to state\n", __func__);
goto out_forget_reply; goto out_forget_reply;
} }
/* Done processing layoutget. Set the layout stateid */
pnfs_set_layout_stateid(lo, &res->stateid, false);
init_lseg(lo, lseg); init_lseg(lo, lseg);
lseg->pls_range = res->range; lseg->pls_range = res->range;
pnfs_get_lseg(lseg); pnfs_get_lseg(lseg);
@ -1191,8 +1195,6 @@ pnfs_layout_process(struct nfs4_layoutget *lgp)
set_bit(NFS_LAYOUT_ROC, &lo->plh_flags); 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); spin_unlock(&ino->i_lock);
return lseg; return lseg;
out: out: