summaryrefslogtreecommitdiffstats
path: root/fs/nfs/pnfs.c
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2015-08-04 16:15:48 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2015-08-12 14:56:19 -0400
commit2d8ae84fbc32a14bba176cf9c20d5eb2a3d42791 (patch)
treec749056dbbd98644b2a3636d3d24e646cb547443 /fs/nfs/pnfs.c
parent5c4a79fb2b1cd80cb58986f6acf402721901c545 (diff)
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.c2
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)
368 if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags)) 368 if (test_and_set_bit(NFS_LAYOUT_RETURN, &lo->plh_flags))
369 return false; 369 return false;
370 lo->plh_return_iomode = 0; 370 lo->plh_return_iomode = 0;
371 lo->plh_block_lgets++;
372 pnfs_get_layout_hdr(lo); 371 pnfs_get_layout_hdr(lo);
373 clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags); 372 clear_bit(NFS_LAYOUT_RETURN_BEFORE_CLOSE, &lo->plh_flags);
374 return true; 373 return true;
@@ -954,7 +953,6 @@ pnfs_send_layoutreturn(struct pnfs_layout_hdr *lo, nfs4_stateid stateid,
954 if (unlikely(lrp == NULL)) { 953 if (unlikely(lrp == NULL)) {
955 status = -ENOMEM; 954 status = -ENOMEM;
956 spin_lock(&ino->i_lock); 955 spin_lock(&ino->i_lock);
957 lo->plh_block_lgets--;
958 pnfs_clear_layoutreturn_waitbit(lo); 956 pnfs_clear_layoutreturn_waitbit(lo);
959 rpc_wake_up(&NFS_SERVER(ino)->roc_rpcwaitq); 957 rpc_wake_up(&NFS_SERVER(ino)->roc_rpcwaitq);
960 spin_unlock(&ino->i_lock); 958 spin_unlock(&ino->i_lock);