* [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd
@ 2015-02-25 13:42 Andrew Elble
2015-02-26 0:30 ` Jeff Layton
2015-02-26 14:28 ` Jeff Layton
0 siblings, 2 replies; 4+ messages in thread
From: Andrew Elble @ 2015-02-25 13:42 UTC (permalink / raw)
To: linux-nfs, etmsys; +Cc: Andrew Elble, stable
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);
}
--
2.2.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd
2015-02-25 13:42 [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd Andrew Elble
@ 2015-02-26 0:30 ` Jeff Layton
2015-02-26 14:28 ` Jeff Layton
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Layton @ 2015-02-26 0:30 UTC (permalink / raw)
To: Andrew Elble; +Cc: linux-nfs, etmsys, stable
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd
2015-02-25 13:42 [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd Andrew Elble
2015-02-26 0:30 ` Jeff Layton
@ 2015-02-26 14:28 ` Jeff Layton
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Layton @ 2015-02-26 14:28 UTC (permalink / raw)
To: Andrew Elble; +Cc: linux-nfs, etmsys, stable
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>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd
@ 2015-02-25 22:53 J. Bruce Fields
0 siblings, 0 replies; 4+ messages in thread
From: J. Bruce Fields @ 2015-02-25 22:53 UTC (permalink / raw)
To: Andrew Elble; +Cc: linux-nfs, Eric Meddaugh
Thanks, applying for 3.20.
--b.
> 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);
> }
> --
> 2.2.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-02-26 14:28 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-25 13:42 [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd Andrew Elble
2015-02-26 0:30 ` Jeff Layton
2015-02-26 14:28 ` Jeff Layton
2015-02-25 22:53 J. Bruce Fields
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.