diff options
author | Alexandros Batsakis <batsakis@netapp.com> | 2009-12-05 13:19:11 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-12-05 13:19:11 -0500 |
commit | b4a6f4966efc7e70dc8d8a9e60744de6845b14bf (patch) | |
tree | 72a2b2687975bc3629dd02efca6bc879fa2bcbfe /fs | |
parent | 07bccc2dd4e8745859f0fa7d120ea39320fbcdbf (diff) |
nfs4: minor delegation cleaning
Signed-off-by: Alexandros Batsakis <batsakis@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/nfs/delegation.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c index eeecd69c130..6fc9fe0af3d 100644 --- a/fs/nfs/delegation.c +++ b/fs/nfs/delegation.c | |||
@@ -391,8 +391,7 @@ static void nfs_client_mark_return_all_delegations(struct nfs_client *clp) | |||
391 | 391 | ||
392 | rcu_read_lock(); | 392 | rcu_read_lock(); |
393 | list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) { | 393 | list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) { |
394 | set_bit(NFS_DELEGATION_RETURN, &delegation->flags); | 394 | nfs_mark_return_delegation(clp, delegation); |
395 | set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state); | ||
396 | } | 395 | } |
397 | rcu_read_unlock(); | 396 | rcu_read_unlock(); |
398 | } | 397 | } |
@@ -427,8 +426,7 @@ static void nfs_client_mark_return_unreferenced_delegations(struct nfs_client *c | |||
427 | list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) { | 426 | list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) { |
428 | if (test_and_clear_bit(NFS_DELEGATION_REFERENCED, &delegation->flags)) | 427 | if (test_and_clear_bit(NFS_DELEGATION_REFERENCED, &delegation->flags)) |
429 | continue; | 428 | continue; |
430 | set_bit(NFS_DELEGATION_RETURN, &delegation->flags); | 429 | nfs_mark_return_delegation(clp, delegation); |
431 | set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state); | ||
432 | } | 430 | } |
433 | rcu_read_unlock(); | 431 | rcu_read_unlock(); |
434 | } | 432 | } |