Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

NFSv4: Remove redundant RENEW calls if we know the lease has expired

Browse source 
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2008-12-23 15:21:42 -05:00
parent b79a4a1b45
commit e598d843c0
3 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fs/nfs/nfs4_fs.h
View file

@ -39,6 +39,7 @@ struct idmap;
enum nfs4_client_state { enum nfs4_client_state {
NFS4CLNT_STATE_RECOVER = 0, NFS4CLNT_STATE_RECOVER = 0,
NFS4CLNT_CHECK_LEASE,
NFS4CLNT_LEASE_EXPIRED, NFS4CLNT_LEASE_EXPIRED,
NFS4CLNT_RECLAIM_REBOOT, NFS4CLNT_RECLAIM_REBOOT,
NFS4CLNT_RECLAIM_NOGRACE, NFS4CLNT_RECLAIM_NOGRACE,

3
fs/nfs/nfs4proc.c
View file

@ -984,7 +984,8 @@ static int nfs4_recover_expired_lease(struct nfs_server *server)
ret = nfs4_wait_clnt_recover(server->client, clp); ret = nfs4_wait_clnt_recover(server->client, clp);
if (ret != 0) if (ret != 0)
return ret; return ret;
if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state) &&
!test_bit(NFS4CLNT_CHECK_LEASE,&clp->cl_state))
break; break;
nfs4_schedule_state_recovery(clp); nfs4_schedule_state_recovery(clp);
} }

47
fs/nfs/nfs4state.c
View file

@ -817,6 +817,8 @@ void nfs4_schedule_state_recovery(struct nfs_client *clp)
{ {
if (!clp) if (!clp)
return; return;
if (!test_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state))
set_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state);
if (test_and_set_bit(NFS4CLNT_STATE_RECOVER, &clp->cl_state) == 0) if (test_and_set_bit(NFS4CLNT_STATE_RECOVER, &clp->cl_state) == 0)
nfs4_recover_state(clp); nfs4_recover_state(clp);
} }
@ -1019,6 +1021,23 @@ static void nfs4_state_end_reclaim_nograce(struct nfs_client *clp)
clear_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state); clear_bit(NFS4CLNT_RECLAIM_NOGRACE, &clp->cl_state);
} }
static void nfs4_recovery_handle_error(struct nfs_client *clp, int error)
{
switch (error) {
case -NFS4ERR_CB_PATH_DOWN:
set_bit(NFS4CLNT_CB_PATH_DOWN, &clp->cl_state);
break;
case -NFS4ERR_STALE_CLIENTID:
case -NFS4ERR_LEASE_MOVED:
set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
nfs4_state_start_reclaim_reboot(clp);
break;
case -NFS4ERR_EXPIRED:
set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
nfs4_state_start_reclaim_nograce(clp);
}
}
static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recovery_ops *ops) static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recovery_ops *ops)
{ {
struct rb_node *pos; struct rb_node *pos;
@ -1031,6 +1050,7 @@ static int nfs4_do_reclaim(struct nfs_client *clp, const struct nfs4_state_recov
if (status < 0) if (status < 0)
break; break;
} }
nfs4_recovery_handle_error(clp, status);
return status; return status;
} }
@ -1045,19 +1065,7 @@ static int nfs4_check_lease(struct nfs_client *clp)
/* Yes there are: try to renew the old lease */ /* Yes there are: try to renew the old lease */
status = nfs4_proc_renew(clp, cred); status = nfs4_proc_renew(clp, cred);
put_rpccred(cred); put_rpccred(cred);
switch (status) { nfs4_recovery_handle_error(clp, status);
case -NFS4ERR_CB_PATH_DOWN:
set_bit(NFS4CLNT_CB_PATH_DOWN, &clp->cl_state);
break;
case -NFS4ERR_STALE_CLIENTID:
case -NFS4ERR_LEASE_MOVED:
set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
nfs4_state_start_reclaim_reboot(clp);
break;
case -NFS4ERR_EXPIRED:
set_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state);
nfs4_state_start_reclaim_nograce(clp);
}
return status; return status;
} }
@ -1095,8 +1103,6 @@ static int reclaimer(void *ptr)
/* Ensure exclusive access to NFSv4 state */ /* Ensure exclusive access to NFSv4 state */
down_write(&clp->cl_sem); down_write(&clp->cl_sem);
while (!list_empty(&clp->cl_superblocks)) { while (!list_empty(&clp->cl_superblocks)) {
status = nfs4_check_lease(clp);
if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) { if (test_and_clear_bit(NFS4CLNT_LEASE_EXPIRED, &clp->cl_state)) {
/* We're going to have to re-establish a clientid */ /* We're going to have to re-establish a clientid */
status = nfs4_reclaim_lease(clp); status = nfs4_reclaim_lease(clp);
@ -1106,16 +1112,21 @@ static int reclaimer(void *ptr)
continue; continue;
goto out_error; goto out_error;
} }
clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state);
}
if (test_and_clear_bit(NFS4CLNT_CHECK_LEASE, &clp->cl_state)) {
status = nfs4_check_lease(clp);
if (status != 0)
continue;
} }
/* First recover reboot state... */ /* First recover reboot state... */
if (test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) { if (test_and_clear_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state)) {
/* Note: list is protected by exclusive lock on cl->cl_sem */ /* Note: list is protected by exclusive lock on cl->cl_sem */
status = nfs4_do_reclaim(clp, &nfs4_reboot_recovery_ops); status = nfs4_do_reclaim(clp, &nfs4_reboot_recovery_ops);
if (status == -NFS4ERR_STALE_CLIENTID) { if (status == -NFS4ERR_STALE_CLIENTID)
set_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state);
continue; continue;
}
nfs4_state_end_reclaim_reboot(clp); nfs4_state_end_reclaim_reboot(clp);
continue; continue;
} }