Attachment 306392 Details for Bug 254195 – patch 3 -- don't requeue block if it was invalidated while GRANT_MSG was in flight

[patch] patch 3 -- don't requeue block if it was invalidated while GRANT_MSG was in flight

04-bz-254195-nlm-don-t-requeue-bl.patch (text/plain), 1.15 KB, created by Jeff Layton on 2008-05-22 15:30:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2008-05-22 15:30:05 UTC

Size: 1.15 KB

patch

obsolete

>BZ#254195: NLM: don't requeue block if it was invalidated while GRANT_MSG was in flight
>
>From: Jeff Layton <jlayton@redhat.com>
>
>It's possible for lockd to catch a SIGKILL while a GRANT_MSG callback
>is in flight. If this happens we don't want the callback to insert the
>block back into the nlm_blocked list.
>
>Signed-off-by: Jeff Layton <jlayton@redhat.com>
>Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
>---
>
> fs/lockd/svclock.c |    9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
>
>diff --git a/fs/lockd/svclock.c b/fs/lockd/svclock.c
>index bf9fd13..f272f2c 100644
>--- a/fs/lockd/svclock.c
>+++ b/fs/lockd/svclock.c
>@@ -799,6 +799,15 @@ static void nlmsvc_grant_callback(struct rpc_task *task, void *data)
> 
> 	dprintk("lockd: GRANT_MSG RPC callback\n");
> 
>+	/* if the block is not queued at this point then it has
>+	 * been invalidated. Don't try to requeue it.
>+	 *
>+	 * The BKL makes sure that lockd doesn't dequeue the block
>+	 * after we check this.
>+	 */
>+	if (!block->b_queued)
>+		return;
>+
> 	/* Technically, we should down the file semaphore here. Since we
> 	 * move the block towards the head of the queue only, no harm
> 	 * can be done, though. */

Actions: View | Diff

Attachments on bug 254195: 277081 | 278361 | 280141 | 280151 | 280161 | 306390 | 306391 | 306392