| Message ID | 1424871775-98137-1-git-send-email-aweits@rit.edu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, 25 Feb 2015 08:42:55 -0500 Andrew Elble <aweits@rit.edu> wrote: > 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> > --- > fs/nfsd/nfs4state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index f6b2a09f793f..d2f2c37dc2db 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); > } Looks right. Reviewed-by: Jeff Layton <jlayton@poochiereds.net> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 25 Feb 2015 08:42:55 -0500 Andrew Elble <aweits@rit.edu> wrote: > 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> > --- > fs/nfsd/nfs4state.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c > index f6b2a09f793f..d2f2c37dc2db 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); > } Reviewed-by: Jeff Layton <jeff.layton@primarydata.com> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index f6b2a09f793f..d2f2c37dc2db 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); }
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> --- fs/nfsd/nfs4state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)