aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@primarydata.com>2017-06-27 17:40:50 -0400
committerTrond Myklebust <trond.myklebust@primarydata.com>2017-06-27 22:26:23 -0400
commit2e31b4cb895ae78db31dffb860cd255d86c6561c (patch)
tree7152005780458fa4f1927e754bc3d97a48025125
parentRevert "NFS: nfs_rename() handle -ERESTARTSYS dentry left behind" (diff)
downloadlinux-dev-2e31b4cb895ae78db31dffb860cd255d86c6561c.tar.xz
linux-dev-2e31b4cb895ae78db31dffb860cd255d86c6561c.zip
NFSv4.1: nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete()
The current code works only for the case where we have exactly one slot, which is no longer true. nfs4_free_slot() will automatically declare the callback channel to be drained when all slots have been returned. Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-rw-r--r--fs/nfs/callback_xdr.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
index c14758e08d73..390ac9c39c59 100644
--- a/fs/nfs/callback_xdr.c
+++ b/fs/nfs/callback_xdr.c
@@ -753,7 +753,6 @@ static void nfs4_callback_free_slot(struct nfs4_session *session,
* A single slot, so highest used slotid is either 0 or -1
*/
nfs4_free_slot(tbl, slot);
- nfs4_slot_tbl_drain_complete(tbl);
spin_unlock(&tbl->slot_tbl_lock);
}