From: NeilBrown <neilb@cse.unsw.edu.au>
There's no reason to have the lockowners hang off the same list on the client
struct as the openowners do; you can always get to the lockowners from their
original openowners instead.
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/fs/nfsd/nfs4state.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN fs/nfsd/nfs4state.c~nfsd4-keep-lockowners-off-perclient-list fs/nfsd/nfs4state.c
--- 25/fs/nfsd/nfs4state.c~nfsd4-keep-lockowners-off-perclient-list 2005-03-07 23:55:49.000000000 -0800
+++ 25-akpm/fs/nfsd/nfs4state.c 2005-03-07 23:55:49.000000000 -0800
@@ -1109,9 +1109,11 @@ unhash_stateowner(struct nfs4_stateowner
list_del(&sop->so_idhash);
list_del(&sop->so_strhash);
- list_del(&sop->so_perclient);
+ if (sop->so_is_open_owner) {
+ list_del(&sop->so_perclient);
+ del_perclient++;
+ }
list_del(&sop->so_perlockowner);
- del_perclient++;
while (!list_empty(&sop->so_perfilestate)) {
stp = list_entry(sop->so_perfilestate.next,
struct nfs4_stateid, st_perfilestate);
@@ -2575,9 +2577,7 @@ alloc_init_lock_stateowner(unsigned int
sop->so_time = 0;
list_add(&sop->so_idhash, &lock_ownerid_hashtbl[idhashval]);
list_add(&sop->so_strhash, &lock_ownerstr_hashtbl[strhashval]);
- list_add(&sop->so_perclient, &clp->cl_perclient);
list_add(&sop->so_perlockowner, &open_stp->st_perlockowner);
- add_perclient++;
sop->so_is_open_owner = 0;
sop->so_id = current_ownerid++;
sop->so_client = clp;
_