]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
NFSv4.1/pnfs: Fixup an lo->plh_block_lgets imbalance in layoutreturn
authorTrond Myklebust <trond.myklebust@primarydata.com>
Mon, 28 Dec 2015 16:27:15 +0000 (11:27 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 19 Feb 2016 22:28:23 +0000 (14:28 -0800)
commit 1a093ceb053832c25b92f3cf26b957543c7baf9b upstream.

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...")
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/nfs/nfs4proc.c

index 5133bb18830e8c8b97e68e8f2c55d617ff92a321..c8bd1ddb7df8570f93382bf6565291c5cca6ade9 100644 (file)
@@ -8060,7 +8060,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);