---

yaml --- r: 175967 b: refs/heads/master c: b4a6f49 h: refs/heads/master i: 175965: da7f734 175963: f2b66d6 175959: 276ec91 175951: 5e8016a 175935: 9942f68 v: v3
git-mirror · Dec 5, 2009 · 018acb6 · 018acb6
1 parent 33d5a79
commit 018acb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07bccc2dd4e8745859f0fa7d120ea39320fbcdbf
+refs/heads/master: b4a6f4966efc7e70dc8d8a9e60744de6845b14bf
diff --git a/trunk/fs/nfs/delegation.c b/trunk/fs/nfs/delegation.c
@@ -391,8 +391,7 @@ static void nfs_client_mark_return_all_delegations(struct nfs_client *clp)
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
-		set_bit(NFS_DELEGATION_RETURN, &delegation->flags);
-		set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state);
+		nfs_mark_return_delegation(clp, delegation);
 	}
 	rcu_read_unlock();
 }
@@ -427,8 +426,7 @@ static void nfs_client_mark_return_unreferenced_delegations(struct nfs_client *c
 	list_for_each_entry_rcu(delegation, &clp->cl_delegations, super_list) {
 		if (test_and_clear_bit(NFS_DELEGATION_REFERENCED, &delegation->flags))
 			continue;
-		set_bit(NFS_DELEGATION_RETURN, &delegation->flags);
-		set_bit(NFS4CLNT_DELEGRETURN, &clp->cl_state);
+		nfs_mark_return_delegation(clp, delegation);
 	}
 	rcu_read_unlock();
 }