diff options
author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-12-28 11:27:15 -0500 |
---|---|---|
committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-12-28 13:23:36 -0500 |
commit | 1a093ceb053832c25b92f3cf26b957543c7baf9b (patch) | |
tree | 9de244cbe2ef16efea4414ac5b0a610d21913bf0 /fs | |
parent | 762674f86d0328d5dc923c966e209e1ee59663f2 (diff) | |
download | linux-stable-1a093ceb053832c25b92f3cf26b957543c7baf9b.tar.gz linux-stable-1a093ceb053832c25b92f3cf26b957543c7baf9b.tar.bz2 linux-stable-1a093ceb053832c25b92f3cf26b957543c7baf9b.zip |
NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturn
Since commit 2d8ae84fbc32, nothing is bumping lo->plh_block_lgets in the
layoutreturn path, so it should not be touched in nfs4_layoutreturn_release
either.
Fixes: 2d8ae84fbc32 ("NFSv4.1/pnfs: Remove redundant lo->plh_block_lgets...")
Cc: stable@vger.kernel.org # 4.3+
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/nfs4proc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 1028d6dc40c0..5dd2cde79f7e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -8057,7 +8057,6 @@ static void nfs4_layoutreturn_release(void *calldata) pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range); pnfs_clear_layoutreturn_waitbit(lo); - lo->plh_block_lgets--; spin_unlock(&lo->plh_inode->i_lock); pnfs_free_lseg_list(&freeme); pnfs_put_layout_hdr(lrp->args.layout); |