diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-04 16:15:48 -0400 |
|---|---|---|
| committer | Trond Myklebust <trond.myklebust@primarydata.com> | 2015-08-12 14:56:19 -0400 |
| commit | 2d8ae84fbc32a14bba176cf9c20d5eb2a3d42791 (patch) | |
| tree | c749056dbbd98644b2a3636d3d24e646cb547443 /fs/nfs/pnfs.c | |
| parent | 5c4a79fb2b1cd80cb58986f6acf402721901c545 (diff) | |
| download | linux-stable-2d8ae84fbc32a14bba176cf9c20d5eb2a3d42791.tar.gz linux-stable-2d8ae84fbc32a14bba176cf9c20d5eb2a3d42791.tar.bz2 linux-stable-2d8ae84fbc32a14bba176cf9c20d5eb2a3d42791.zip | |
NFSv4.1/pnfs: Remove redundant lo->plh_block_lgets in layoutreturn
The NFS_LAYOUT_RETURN bit already suffices to ensure that layoutget
is blocked.
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Diffstat (limited to 'fs/nfs/pnfs.c')
| -rw-r--r-- | fs/nfs/pnfs.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/pnfs.c b/fs/nfs/pnfs.c index 8c5f9f59efbb..ada07376a6c7 100644 --- a/fs/nfs/pnfs.c +++ b/fs/nfs/pnfs.c @@ -368,7 +368,6 @@ pnfs_prepare_layoutreturn(struct pnfs_layout_hdr *lo) if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) return false; lo->plh_return_iomode = 0; - lo->plh_block_lgets++; pnfs_get_layout_hdr(lo); clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags); return true; @@ -954,7 +953,6 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, nfs4_stateid stateid, if (unlikely(lrp == NULL)) { status = -ENOMEM; spin_lock(&ino->i_lock); - lo->plh_block_lgets--; pnfs_clear_layoutreturn_waitbit(lo); rpc_wake_up(&NFS_SERVER(ino)->roc_rpcwaitq); spin_unlock(&ino->i_lock); |