aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-12-28 11:27:15 -0500
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-12-28 13:23:36 -0500
commit1a093ceb053832c25b92f3cf26b957543c7baf9b (patch)
tree9de244cbe2ef16efea4414ac5b0a610d21913bf0
parent762674f86d0328d5dc923c966e209e1ee59663f2 (diff)
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>
-rw-r--r--fs/nfs/nfs4proc.c1
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)
8057 pnfs_set_layout_stateid(lo, &lrp->res.stateid, true); 8057 pnfs_set_layout_stateid(lo, &lrp->res.stateid, true);
8058 pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range); 8058 pnfs_mark_matching_lsegs_invalid(lo, &freeme, &lrp->args.range);
8059 pnfs_clear_layoutreturn_waitbit(lo); 8059 pnfs_clear_layoutreturn_waitbit(lo);
8060 lo->plh_block_lgets--;
8061 spin_unlock(&lo->plh_inode->i_lock); 8060 spin_unlock(&lo->plh_inode->i_lock);
8062 pnfs_free_lseg_list(&freeme); 8061 pnfs_free_lseg_list(&freeme);
8063 pnfs_put_layout_hdr(lrp->args.layout); 8062 pnfs_put_layout_hdr(lrp->args.layout);