From cf0ab638e03097a6d49e18bb3ae4ae25ca69fd30 Mon Sep 17 00:00:00 2001 From: Bryan Schumaker Date: Tue, 13 Dec 2011 16:35:58 -0500 Subject: [PATCH] --- yaml --- r: 284643 b: refs/heads/master c: 39c4cc0fcc38cff29d5b9884372b17c894c9c080 h: refs/heads/master i: 284641: e9e85870839c33c0569514b17e5170ce9d01efc3 284639: 7b2b9a4949a2d8aeff6d7605828d57ed90df543c v: v3 --- [refs] | 2 +- trunk/fs/nfsd/nfs4state.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8121b1123b2b..cdd144c8a3fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f32f3c2d3f09a586349ca9180885dc8741290fd9 +refs/heads/master: 39c4cc0fcc38cff29d5b9884372b17c894c9c080 diff --git a/trunk/fs/nfsd/nfs4state.c b/trunk/fs/nfsd/nfs4state.c index 213da7b7e7d3..19ca9b54200b 100644 --- a/trunk/fs/nfsd/nfs4state.c +++ b/trunk/fs/nfsd/nfs4state.c @@ -1066,7 +1066,6 @@ expire_client(struct nfs4_client *clp) spin_unlock(&recall_lock); while (!list_empty(&reaplist)) { dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); - list_del_init(&dp->dl_recall_lru); unhash_delegation(dp); } while (!list_empty(&clp->cl_openowners)) { @@ -3133,7 +3132,6 @@ nfs4_laundromat(void) spin_unlock(&recall_lock); list_for_each_safe(pos, next, &reaplist) { dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); - list_del_init(&dp->dl_recall_lru); unhash_delegation(dp); } test_val = nfsd4_lease; @@ -4674,7 +4672,6 @@ __nfs4_state_shutdown(void) spin_unlock(&recall_lock); list_for_each_safe(pos, next, &reaplist) { dp = list_entry (pos, struct nfs4_delegation, dl_recall_lru); - list_del_init(&dp->dl_recall_lru); unhash_delegation(dp); }