public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-nfs@vger.kernel.org
Cc: Benny Halevy <bhalevy@primarydata.com>,
	Benny Halevy <bhalevy@panasas.com>
Subject: [PATCH 2/2] nfsd: do not clear rpc_resp in nfsd4_cb_done_sequence
Date: Tue, 23 Sep 2014 08:58:49 +0200	[thread overview]
Message-ID: <1411455529-11556-3-git-send-email-hch@lst.de> (raw)
In-Reply-To: <1411455529-11556-1-git-send-email-hch@lst.de>

From: Benny Halevy <bhalevy@panasas.com>

This is incorrect when a callback is has to be restarted, in which case
the XDR decoding of the second iteration will see a NULL cb argument.

[hch: updated description]
Signed-off-by: Benny Halevy <bhalevy@panasas.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 fs/nfsd/nfs4callback.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c
index 795e218..fc07084 100644
--- a/fs/nfsd/nfs4callback.c
+++ b/fs/nfsd/nfs4callback.c
@@ -847,9 +847,6 @@ static void nfsd4_cb_done(struct rpc_task *task, void *calldata)
 		rpc_wake_up_next(&clp->cl_cb_waitq);
 		dprintk("%s: freed slot, new seqid=%d\n", __func__,
 			clp->cl_cb_session->se_cb_seq_nr);
-
-		/* We're done looking into the sequence information */
-		task->tk_msg.rpc_resp = NULL;
 	}
 }
 
-- 
1.9.1


  parent reply	other threads:[~2014-09-23  6:56 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-23  6:58 CB_RECALL fixes Christoph Hellwig
2014-09-23  6:58 ` [PATCH 1/2] nfsd: fix nfsd4_cb_recall_done error handling Christoph Hellwig
2014-09-23  6:58 ` Christoph Hellwig [this message]
2014-09-23 19:33 ` CB_RECALL fixes J. Bruce Fields
2014-09-24  8:22   ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1411455529-11556-3-git-send-email-hch@lst.de \
    --to=hch@lst.de \
    --cc=bhalevy@panasas.com \
    --cc=bhalevy@primarydata.com \
    --cc=linux-nfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox