From 018acb6ae297bf72281cf3975aa2f9e59b911178 Mon Sep 17 00:00:00 2001 From: Alexandros Batsakis Date: Sat, 5 Dec 2009 13:19:11 -0500 Subject: [PATCH] --- yaml --- r: 175967 b: refs/heads/master c: b4a6f4966efc7e70dc8d8a9e60744de6845b14bf h: refs/heads/master i: 175965: da7f73405311b8626633fa0a4719a21505f83aa8 175963: f2b66d65969844057f32a5025b23ea49949f32bb 175959: 276ec91f87a7723660f492f3e9fec25fdd42d5e6 175951: 5e8016af94f9e9dc85947bdda127462998440f4a 175935: 9942f681c6bd0fb864106550f26d44a2525434a2 v: v3 --- [refs] | 2 +- trunk/fs/nfs/delegation.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1a7cc9e416bc..9b1ef011c5a6 100644 --- 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 index eeecd69c130c..6fc9fe0af3d0 100644 --- 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(); }