mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-13 20:33:15 +00:00
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFSv4: Fix the case where NFSv4 renewal fails nfs: fix build error in nfsroot with initconst XPRTRDMA: fix client rpcrdma FRMR registration on mlx4 devices
This commit is contained in:
commit
e2a1b9ee23
@ -2594,12 +2594,9 @@ static void nfs4_renew_done(struct rpc_task *task, void *data)
|
||||
unsigned long timestamp = (unsigned long)data;
|
||||
|
||||
if (task->tk_status < 0) {
|
||||
switch (task->tk_status) {
|
||||
case -NFS4ERR_STALE_CLIENTID:
|
||||
case -NFS4ERR_EXPIRED:
|
||||
case -NFS4ERR_CB_PATH_DOWN:
|
||||
nfs4_schedule_state_recovery(clp);
|
||||
}
|
||||
/* Unless we're shutting down, schedule state recovery! */
|
||||
if (test_bit(NFS_CS_RENEWD, &clp->cl_res_state) != 0)
|
||||
nfs4_schedule_state_recovery(clp);
|
||||
return;
|
||||
}
|
||||
spin_lock(&clp->cl_lock);
|
||||
|
@ -129,7 +129,7 @@ enum {
|
||||
Opt_err
|
||||
};
|
||||
|
||||
static match_table_t __initconst tokens = {
|
||||
static const match_table_t tokens __initconst = {
|
||||
{Opt_port, "port=%u"},
|
||||
{Opt_rsize, "rsize=%u"},
|
||||
{Opt_wsize, "wsize=%u"},
|
||||
|
@ -1495,7 +1495,8 @@ rpcrdma_register_frmr_external(struct rpcrdma_mr_seg *seg,
|
||||
frmr_wr.wr.fast_reg.page_shift = PAGE_SHIFT;
|
||||
frmr_wr.wr.fast_reg.length = i << PAGE_SHIFT;
|
||||
frmr_wr.wr.fast_reg.access_flags = (writing ?
|
||||
IB_ACCESS_REMOTE_WRITE : IB_ACCESS_REMOTE_READ);
|
||||
IB_ACCESS_REMOTE_WRITE | IB_ACCESS_LOCAL_WRITE :
|
||||
IB_ACCESS_REMOTE_READ);
|
||||
frmr_wr.wr.fast_reg.rkey = seg1->mr_chunk.rl_mw->r.frmr.fr_mr->rkey;
|
||||
DECR_CQCOUNT(&r_xprt->rx_ep);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user