diff options
| author | Andrew Elble <aweits@rit.edu> | 2015-02-25 17:46:27 -0500 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2015-02-26 15:32:24 -0500 |
| commit | c876486be17aeefe0da569f3d111cbd8de6f675d (patch) | |
| tree | 70e4081a62317dc5bd950ffa71ec2cf721ad4299 /fs/nfsd | |
| parent | a1d1e9be5a1dafe0ddc2181a9201c2ae29c71eff (diff) | |
| download | op-kernel-dev-c876486be17aeefe0da569f3d111cbd8de6f675d.zip op-kernel-dev-c876486be17aeefe0da569f3d111cbd8de6f675d.tar.gz | |
nfsd: fix clp->cl_revoked list deletion causing softlock in nfsd
commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is
protected by clp->cl_lock") removed the use of the reaplist to
clean out clp->cl_revoked. It failed to change list_entry() to
walk clp->cl_revoked.next instead of reaplist.next
Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock")
Cc: stable@vger.kernel.org
Reported-by: Eric Meddaugh <etmsys@rit.edu>
Tested-by: Eric Meddaugh <etmsys@rit.edu>
Signed-off-by: Andrew Elble <aweits@rit.edu>
Reviewed-by: Jeff Layton <jeff.layton@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfsd')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f6b2a09..d2f2c37 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1638,7 +1638,7 @@ __destroy_client(struct nfs4_client *clp) nfs4_put_stid(&dp->dl_stid); } while (!list_empty(&clp->cl_revoked)) { - dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru); + dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru); list_del_init(&dp->dl_recall_lru); nfs4_put_stid(&dp->dl_stid); } |
