From patchwork Tue Apr 15 12:51:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 3992741 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9E418C0DA2 for ; Tue, 15 Apr 2014 12:52:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D11B420212 for ; Tue, 15 Apr 2014 12:51:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D834520221 for ; Tue, 15 Apr 2014 12:51:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755063AbaDOMv4 (ORCPT ); Tue, 15 Apr 2014 08:51:56 -0400 Received: from mail-qc0-f173.google.com ([209.85.216.173]:35953 "EHLO mail-qc0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755065AbaDOMvz (ORCPT ); Tue, 15 Apr 2014 08:51:55 -0400 Received: by mail-qc0-f173.google.com with SMTP id r5so10386262qcx.32 for ; Tue, 15 Apr 2014 05:51:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=ZqOMprjsp+jLSctluKbBI649+WnjJwH3rlAF09Mo52Y=; b=Mq3czopI1u6wYsUIjyaTuSWEECx1jjd8wQhH+ngBZBe597FBuph0H9ujOSHwyHnSB5 5wcVOiRj3uU5auhDILfR+q0A6qt4EK4JsaVOYkg+4xCXwTVoQbO9qbWkTqBqaUVc9Qpn 6zm33obfMb1fcm7s0Ry1jQGGwLd45Vf3auF9AT4/OCzYAkF2U78Sc8aEtuWK4F6kLhme DyGcih6WHB3fIHGnbtK8YoAvlbyWP0HXHrRc+eaFvzJOjo/eVNxjBdmWQA4RPhRGj/0/ H40HFv6Cv91rOnWLpambOpDckG7mbIpivCD0v9jK5aoMOW4ER4uW2fhtR+fVtMSKKfsT sluw== X-Gm-Message-State: ALoCoQnkTPrIvWi93Dhder6JSYNuWJej8fGA0hwm5ouLOjhygQLg9ORbR11jkHN6T69jlmKn8FoF X-Received: by 10.140.51.161 with SMTP id u30mr2071219qga.69.1397566314466; Tue, 15 Apr 2014 05:51:54 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id s13sm37273627qag.19.2014.04.15.05.51.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Apr 2014 05:51:53 -0700 (PDT) From: Jeff Layton To: bfields@fieldses.org Cc: trond.myklebust@primarydata.com, linux-nfs@vger.kernel.org Subject: [PATCH] nfsd: set timeparms.to_maxval in setup_callback_client Date: Tue, 15 Apr 2014 08:51:48 -0400 Message-Id: <1397566308-16871-1-git-send-email-jlayton@redhat.com> X-Mailer: git-send-email 1.9.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ...otherwise the logic in the timeout handling doesn't work correctly. Spotted-by: Trond Myklebust Signed-off-by: Jeff Layton --- fs/nfsd/nfs4callback.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 39c8ef875f91..2c73cae9899d 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c @@ -654,9 +654,11 @@ static struct rpc_clnt *create_backchannel_client(struct rpc_create_args *args) static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *conn, struct nfsd4_session *ses) { + int maxtime = max_cb_time(clp->net); struct rpc_timeout timeparms = { - .to_initval = max_cb_time(clp->net), + .to_initval = maxtime, .to_retries = 0, + .to_maxval = maxtime, }; struct rpc_create_args args = { .net = clp->net,