Merge tag 'nfs-rdma-for-5.5-1' of git://git.linux-nfs.org/projects/anna/linux-nfs
NFSoRDMA Client Updates for Linux 5.5 New Features: - New tracepoints for congestion control and Local Invalidate WRs Bugfixes and Cleanups: - Eliminate log noise in call_reserveresult - Fix unstable connections after a reconnect - Clean up some code duplication - Close race between waking a sender and posting a receive - Fix MR list corruption, and clean up MR usage - Remove unused rpcrdma_sendctx fields - Try to avoid DMA mapping pages if it is too costly - Wake pending tasks if connection fails - Replace some dprintk()s with tracepoints
This commit is contained in:
@@ -1679,8 +1679,6 @@ call_reserveresult(struct rpc_task *task)
|
||||
return;
|
||||
}
|
||||
|
||||
printk(KERN_ERR "%s: status=%d, but no request slot, exiting\n",
|
||||
__func__, status);
|
||||
rpc_call_rpcerror(task, -EIO);
|
||||
return;
|
||||
}
|
||||
@@ -1689,11 +1687,8 @@ call_reserveresult(struct rpc_task *task)
|
||||
* Even though there was an error, we may have acquired
|
||||
* a request slot somehow. Make sure not to leak it.
|
||||
*/
|
||||
if (task->tk_rqstp) {
|
||||
printk(KERN_ERR "%s: status=%d, request allocated anyway\n",
|
||||
__func__, status);
|
||||
if (task->tk_rqstp)
|
||||
xprt_release(task);
|
||||
}
|
||||
|
||||
switch (status) {
|
||||
case -ENOMEM:
|
||||
@@ -1702,14 +1697,9 @@ call_reserveresult(struct rpc_task *task)
|
||||
case -EAGAIN: /* woken up; retry */
|
||||
task->tk_action = call_retry_reserve;
|
||||
return;
|
||||
case -EIO: /* probably a shutdown */
|
||||
break;
|
||||
default:
|
||||
printk(KERN_ERR "%s: unrecognized error %d, exiting\n",
|
||||
__func__, status);
|
||||
break;
|
||||
rpc_call_rpcerror(task, status);
|
||||
}
|
||||
rpc_call_rpcerror(task, status);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user