From: Trond Myklebust Date: Tue, 27 Jun 2017 21:40:50 +0000 (-0400) Subject: NFSv4.1: nfs4_callback_free_slot() cannot call nfs4_slot_tbl_drain_complete() X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=2e31b4cb895ae78db31dffb860cd255d86c6561c;p=openwrt%2Fstaging%2Fblogic.git 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 --- 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); }