Return-Path: Received: from mail-qk0-f182.google.com ([209.85.220.182]:35681 "EHLO mail-qk0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752562AbbFLAcl (ORCPT ); Thu, 11 Jun 2015 20:32:41 -0400 Received: by qkhq76 with SMTP id q76so10274198qkh.2 for ; Thu, 11 Jun 2015 17:32:35 -0700 (PDT) Message-ID: <557A2898.6020009@gmail.com> Date: Fri, 12 Jun 2015 08:32:24 +0800 From: Kinglong Mee MIME-Version: 1.0 To: Trond Myklebust , "linux-nfs@vger.kernel.org" CC: Weston Andros Adamson , "J. Bruce Fields" , Christoph Hellwig Subject: Re: [PATCH 2/2] nfs: Initialize cb_sequenceres information before validate_seqid() References: <556D8C75.4050409@gmail.com> In-Reply-To: <556D8C75.4050409@gmail.com> Content-Type: text/plain; charset=utf-8 Sender: linux-nfs-owner@vger.kernel.org List-ID: And this one. Ping ... On 6/2/2015 6:59 PM, Kinglong Mee wrote: > For a cb_layoutrecall replay, nfsd got CB_SEQUENCE status of zero, > but all informations of cb_sequenceres are zero too !!! > > validate_seqid() return NFS4ERR_RETRY_UNCACHED_REP for a replay, > and skip the initlize cb_sequenceres. > > Signed-off-by: Kinglong Mee > --- > fs/nfs/callback_proc.c | 14 +++++++------- > 1 file changed, 7 insertions(+), 7 deletions(-) > > diff --git a/fs/nfs/callback_proc.c b/fs/nfs/callback_proc.c > index 7e9653a..17a5c57 100644 > --- a/fs/nfs/callback_proc.c > +++ b/fs/nfs/callback_proc.c > @@ -445,6 +445,13 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, > goto out; > } > > + memcpy(&res->csr_sessionid, &args->csa_sessionid, > + sizeof(res->csr_sessionid)); > + res->csr_sequenceid = args->csa_sequenceid; > + res->csr_slotid = args->csa_slotid; > + res->csr_highestslotid = NFS41_BC_MAX_CALLBACKS - 1; > + res->csr_target_highestslotid = NFS41_BC_MAX_CALLBACKS - 1; > + > status = validate_seqid(tbl, args); > spin_unlock(&tbl->slot_tbl_lock); > if (status) > @@ -462,13 +469,6 @@ __be32 nfs4_callback_sequence(struct cb_sequenceargs *args, > goto out; > } > > - memcpy(&res->csr_sessionid, &args->csa_sessionid, > - sizeof(res->csr_sessionid)); > - res->csr_sequenceid = args->csa_sequenceid; > - res->csr_slotid = args->csa_slotid; > - res->csr_highestslotid = NFS41_BC_MAX_CALLBACKS - 1; > - res->csr_target_highestslotid = NFS41_BC_MAX_CALLBACKS - 1; > - > /* > * RFC5661 20.9.3 > * If CB_SEQUENCE returns an error, then the state of the slot >