nfs4: V2 return/expire delegations depending on their type

Signed-off-by: Alexandros Batsakis <batsakis@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Alexandros Batsakis 2009-12-05 13:20:52 -05:00 committed by Trond Myklebust
parent b4a6f4966e
commit c79571a508

View file

@ -385,27 +385,41 @@ void nfs_super_return_all_delegations(struct super_block *sb)
nfs4_schedule_state_manager(clp); nfs4_schedule_state_manager(clp);
} }
static void nfs_client_mark_return_all_delegations(struct nfs_client *clp) static
void nfs_client_mark_return_all_delegation_types(struct nfs_client *clp, fmode_t flags)
{ {
struct nfs_delegation *delegation; struct nfs_delegation *delegation;
rcu_read_lock(); rcu_read_lock();
list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) { list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
nfs_mark_return_delegation(clp, delegation); if ((delegation->type == (FMODE_READ|FMODE_WRITE)) && !(flags & FMODE_WRITE))
continue;
if (delegation->type & flags)
nfs_mark_return_delegation(clp, delegation);
} }
rcu_read_unlock(); rcu_read_unlock();
} }
static void nfs_client_mark_return_all_delegations(struct nfs_client *clp)
{
nfs_client_mark_return_all_delegation_types(clp, FMODE_READ|FMODE_WRITE);
}
static void nfs_delegation_run_state_manager(struct nfs_client *clp) static void nfs_delegation_run_state_manager(struct nfs_client *clp)
{ {
if (test_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state)) if (test_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state))
nfs4_schedule_state_manager(clp); nfs4_schedule_state_manager(clp);
} }
static void nfs_expire_all_delegation_types(struct nfs_client *clp, fmode_t flags)
{
nfs_client_mark_return_all_delegation_types(clp, flags);
nfs_delegation_run_state_manager(clp);
}
void nfs_expire_all_delegations(struct nfs_client *clp) void nfs_expire_all_delegations(struct nfs_client *clp)
{ {
nfs_client_mark_return_all_delegations(clp); nfs_expire_all_delegation_types(clp, FMODE_READ|FMODE_WRITE);
nfs_delegation_run_state_manager(clp);
} }
/* /*