From patchwork Tue Aug 1 20:02:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 9875423 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E21860365 for ; Tue, 1 Aug 2017 20:03:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31E3A28731 for ; Tue, 1 Aug 2017 20:03:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 270FE2873C; Tue, 1 Aug 2017 20:03:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCBC328731 for ; Tue, 1 Aug 2017 20:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752246AbdHAUDF (ORCPT ); Tue, 1 Aug 2017 16:03:05 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:34391 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752166AbdHAUDE (ORCPT ); Tue, 1 Aug 2017 16:03:04 -0400 Received: by mail-io0-f193.google.com with SMTP id m88so2295429iod.1 for ; Tue, 01 Aug 2017 13:03:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=I5nd+fcW56lioET1rUFYL4U3gQfzpm7Pgep7d4b65b8=; b=jDw97ES1Ur/o5w0iWE+CNxjjPWQZr49ZrBqJxn0IjCl8dKwEMb9u8fo3FpwYq5+raT tk2v3xZz3ZGuD2O7WRcGrBefYPwrq768UAY4SondPkldJb241PFnjVyzYvTkirSeexP1 TV6wQrDvsCR2q3oNXeh85bCf3Gp1ZNXQn7OqMVSQKSPAnVwoHUdhI9/1HOda/2sT95pB 7nHYQjSGOBEHmLvfHDYTENbKieeT5yMFIYrjWKjd4ht9crv6V7cc3JswRF5HrlqwwmL0 IZp7FYN/6ikCfM+CBexAzUOu94e32N+6krIZvitvglbirJ2eccbPByoCNYnqiaoxFUh7 Ff8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=I5nd+fcW56lioET1rUFYL4U3gQfzpm7Pgep7d4b65b8=; b=kgivvKL9EiBsVAqXzji1pNiePDmLGhdH4IYlE5zmgQwJtc6ahhukBlPx8pRrNFt33r +NFXRtvJYBBnnjl8HAIIjv8FDEfIgSBIrHl2/NuFtPSOUnjAIb8NxBhSwSW4gU8Ys388 cXjdp7V1pH87TbCgnUxtTtXY6sS6TEs0sDL2TFGygC6grhbRUvSgY3mMZaRFbis7T6EY XqMhLjYQHeayfj3ts0l+OVdebn2Xj8uyjESogGOFN0zc8WAkLFNQZkXSAMEgJjSwYz9S ELffeb3VN39+wVqMuAc9oLklZIRiLxQ7eDq1Jl0GvD+k0ElNiLTAOxaX4aHBdZCueSR7 It7A== X-Gm-Message-State: AIVw1138FEpgn0h2u62bQw+jJmOTsMJUcoT7GDoQSV02nZze3zAAMOyq B4+AMPgyblSEaQ== X-Received: by 10.107.41.5 with SMTP id p5mr22545315iop.165.1501617784172; Tue, 01 Aug 2017 13:03:04 -0700 (PDT) Received: from localhost.localdomain (static-50-108-4-17.mskg.mi.frontiernet.net. [50.108.4.17]) by smtp.gmail.com with ESMTPSA id o127sm10615519iof.47.2017.08.01.13.03.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Aug 2017 13:03:03 -0700 (PDT) From: Trond Myklebust To: Anna Schumaker Cc: davej@codemonkey.org.uk, linux-nfs@vger.kernel.org Subject: [PATCH 5/5] NFSv4: Cleanup setting of the migration flags. Date: Tue, 1 Aug 2017 16:02:51 -0400 Message-Id: <20170801200251.130635-5-trond.myklebust@primarydata.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170801200251.130635-4-trond.myklebust@primarydata.com> References: <20170801200251.130635-1-trond.myklebust@primarydata.com> <20170801200251.130635-2-trond.myklebust@primarydata.com> <20170801200251.130635-3-trond.myklebust@primarydata.com> <20170801200251.130635-4-trond.myklebust@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Trond Myklebust --- fs/nfs/nfs4proc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index d9fc34dedcf8..15e91f003adc 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -7498,13 +7498,10 @@ nfs4_run_exchange_id(struct nfs_client *clp, struct rpc_cred *cred, sizeof(calldata->args.verifier.data)); } calldata->args.client = clp; -#ifdef CONFIG_NFS_V4_1_MIGRATION - calldata->args.flags = EXCHGID4_FLAG_SUPP_MOVED_REFER | - EXCHGID4_FLAG_BIND_PRINC_STATEID | - EXCHGID4_FLAG_SUPP_MOVED_MIGR, -#else calldata->args.flags = EXCHGID4_FLAG_SUPP_MOVED_REFER | - EXCHGID4_FLAG_BIND_PRINC_STATEID, + EXCHGID4_FLAG_BIND_PRINC_STATEID; +#ifdef CONFIG_NFS_V4_1_MIGRATION + calldata->args.flags |= EXCHGID4_FLAG_SUPP_MOVED_MIGR; #endif msg.rpc_argp = &calldata->args; msg.rpc_resp = &calldata->res;