diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-24 12:26:34 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2016-07-24 12:51:49 -0400 |
| commit | 45fcc7bca7004687e9ba28e08b3dfb6787a0b466 (patch) | |
| tree | ed5f90b361769a5f664ae94cf262e420279790fa | |
| parent | dc05973b288a5226bb7e56afd6c2fa07560a907c (diff) | |
| download | linux-stable-45fcc7bca7004687e9ba28e08b3dfb6787a0b466.tar.gz linux-stable-45fcc7bca7004687e9ba28e08b3dfb6787a0b466.tar.bz2 linux-stable-45fcc7bca7004687e9ba28e08b3dfb6787a0b466.zip | |
pNFS: LAYOUTRETURN should only update the stateid if the layout is valid
If the layout was completely returned, then ignore the returned layout
stateid.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 | ||||
| -rw-r--r-- | fs/nfs/pnfs.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index ff416d0e24bc..dc50ba4d84ad 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8130,7 +8130,7 @@ static void nfs4_layoutreturn_release(void *calldata) pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range, be32_to_cpu(lrp->args.stateid.seqid)); pnfs_mark_layout_returned_if_empty(lo); - if (lrp->res.lrs_present) + if (lrp->res.lrs_present && pnfs_layout_is_valid(lo)) pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); pnfs_clear_layoutreturn_waitbit(lo); spin_unlock(&lo->plh_inode->i_lock); diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h index b21bd0bee784..2f4f26905c03 100644 --- a/fs/nfs/pnfs.h +++ b/fs/nfs/pnfs.h @@ -375,6 +375,11 @@ static inline bool nfs_have_layout(struct inode *inode) return NFS_I(inode)->layout != NULL; } +static inline bool pnfs_layout_is_valid(const struct pnfs_layout_hdr *lo) +{ + return test_bit(NFS_LAYOUT_INVALID_STID, &lo->plh_flags) == 0; +} + static inline struct nfs4_deviceid_node * nfs4_get_deviceid(struct nfs4_deviceid_node *d) { |