diff options
author | Bryan Schumaker <bjschuma@netapp.com> | 2011-12-13 16:35:58 -0500 |
---|---|---|
committer | J. Bruce Fields <bfields@redhat.com> | 2011-12-13 17:11:45 -0500 |
commit | 39c4cc0fcc38cff29d5b9884372b17c894c9c080 (patch) | |
tree | d8c0aa66851c25df8c29b796e550b256eceb3e09 /fs/nfsd | |
parent | f32f3c2d3f09a586349ca9180885dc8741290fd9 (diff) |
NFSD: Only reinitilize the recall_lru list under the recall lock
unhash_delegation() will grab the recall lock before calling
list_del_init() in each of these places. This patch removes the
redundant calls.
Signed-off-by: Bryan Schumaker <bjschuma@netapp.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
-rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 213da7b7e7d3..19ca9b54200b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c | |||
@@ -1066,7 +1066,6 @@ expire_client(struct nfs4_client *clp) | |||
1066 | spin_unlock(&recall_lock); | 1066 | spin_unlock(&recall_lock); |
1067 | while (!list_empty(&reaplist)) { | 1067 | while (!list_empty(&reaplist)) { |
1068 | dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); | 1068 | dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); |
1069 | list_del_init(&dp->dl_recall_lru); | ||
1070 | unhash_delegation(dp); | 1069 | unhash_delegation(dp); |
1071 | } | 1070 | } |
1072 | while (!list_empty(&clp->cl_openowners)) { | 1071 | while (!list_empty(&clp->cl_openowners)) { |
@@ -3133,7 +3132,6 @@ nfs4_laundromat(void) | |||
3133 | spin_unlock(&recall_lock); | 3132 | spin_unlock(&recall_lock); |
3134 | list_for_each_safe(pos, next, &reaplist) { | 3133 | list_for_each_safe(pos, next, &reaplist) { |
3135 | dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); | 3134 | dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); |
3136 | list_del_init(&dp->dl_recall_lru); | ||
3137 | unhash_delegation(dp); | 3135 | unhash_delegation(dp); |
3138 | } | 3136 | } |
3139 | test_val = nfsd4_lease; | 3137 | test_val = nfsd4_lease; |
@@ -4674,7 +4672,6 @@ __nfs4_state_shutdown(void) | |||
4674 | spin_unlock(&recall_lock); | 4672 | spin_unlock(&recall_lock); |
4675 | list_for_each_safe(pos, next, &reaplist) { | 4673 | list_for_each_safe(pos, next, &reaplist) { |
4676 | dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); | 4674 | dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); |
4677 | list_del_init(&dp->dl_recall_lru); | ||
4678 | unhash_delegation(dp); | 4675 | unhash_delegation(dp); |
4679 | } | 4676 | } |
4680 | 4677 | ||