From patchwork Tue Jun 25 16:23:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 2778061 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D87719F245 for ; Tue, 25 Jun 2013 16:23:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3A74120366 for ; Tue, 25 Jun 2013 16:23:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4555520186 for ; Tue, 25 Jun 2013 16:23:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751275Ab3FYQXa (ORCPT ); Tue, 25 Jun 2013 12:23:30 -0400 Received: from mail-gh0-f178.google.com ([209.85.160.178]:57590 "EHLO mail-gh0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751274Ab3FYQXa (ORCPT ); Tue, 25 Jun 2013 12:23:30 -0400 Received: by mail-gh0-f178.google.com with SMTP id g15so4102215ghb.9 for ; Tue, 25 Jun 2013 09:23:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:from:cc:date:message-id:in-reply-to:references :user-agent:mime-version:content-type:content-transfer-encoding; bh=BnrAaNRXMmvRnnSCOIsOCUsXzdAhe8Qx/yoFe9hhrnw=; b=TwECNWuNc4ECsUo/jrtl7ABpWxiEnpluFJCpXVgA1VizZeDf+AUxMxXK9nGAf2IfsP iGyDlm/8iMQZ90yd26HKQDRMmFT97hpF5um0VW4K66Auoc646B2nNPd+YOyjdsXcSxBA roKfeHkHWDEwQNMdPM7icjb1FXUEVsRuNqqKW5YXXvgqBF8hksrlUpP0C2A2fAlkRjS3 hEMBSIgPl5sB6nH07kl2ktMbSgE4ZsPIxwVQ+t4ys6rKKz2SPnuUDka6X9VY/2Ma/pOt JBVaOtAmwr8ps2tdWQApQIGuThbDEwx77rX8eDnnDjsBhaFVYx2KpCGzzfWiJMxE3Sie Drkg== X-Received: by 10.236.32.208 with SMTP id o56mr15513314yha.231.1372177409537; Tue, 25 Jun 2013 09:23:29 -0700 (PDT) Received: from seurat.1015granger.net ([2604:8800:100:81fc:20c:29ff:fe93:815b]) by mx.google.com with ESMTPSA id 62sm38771334yhi.10.2013.06.25.09.23.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Jun 2013 09:23:28 -0700 (PDT) Subject: [PATCH 1/5] NFS: Set NFS_CS_MIGRATION for NFSv4 mounts To: trond.myklebust@netapp.com From: Chuck Lever Cc: linux-nfs@vger.kernel.org Date: Tue, 25 Jun 2013 12:23:27 -0400 Message-ID: <20130625162327.36416.68503.stgit@seurat.1015granger.net> In-Reply-To: <20130625162233.36416.34947.stgit@seurat.1015granger.net> References: <20130625162233.36416.34947.stgit@seurat.1015granger.net> User-Agent: StGit/0.16 MIME-Version: 1.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=-8.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,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 NFS_CS_MIGRATION makes sense only for NFSv4 mounts. Introduced by commit 89652617 (NFS: Introduce "migration" mount option) Fri Sep 14 17:24:11 2012. Signed-off-by: Chuck Lever --- fs/nfs/client.c | 2 -- fs/nfs/nfs4client.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/fs/nfs/client.c b/fs/nfs/client.c index c513b0c..dbb65fb 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -753,8 +753,6 @@ static int nfs_init_server(struct nfs_server *server, data->timeo, data->retrans); if (data->flags & NFS_MOUNT_NORESVPORT) set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); - if (server->options & NFS_OPTION_MIGRATION) - set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); /* Allocate or find a client reference we can use */ clp = nfs_get_client(&cl_init, &timeparms, NULL, RPC_AUTH_UNIX); diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 4cbad5d..b7a9f76 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -626,6 +626,8 @@ static int nfs4_set_client(struct nfs_server *server, if (server->flags & NFS_MOUNT_NORESVPORT) set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); + if (server->options & NFS_OPTION_MIGRATION) + set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); /* Allocate or find a client reference we can use */ clp = nfs_get_client(&cl_init, timeparms, ip_addr, authflavour);