diff mbox

[5/5] NFSv4: Cleanup setting of the migration flags.

Message ID 20170801200251.130635-5-trond.myklebust@primarydata.com (mailing list archive)
State New, archived
Headers show

Commit Message

Trond Myklebust Aug. 1, 2017, 8:02 p.m. UTC 
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4proc.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Chuck Lever Aug. 1, 2017, 8:07 p.m. UTC | #1 
> On Aug 1, 2017, at 4:02 PM, Trond Myklebust <trond.myklebust@primarydata.com> wrote:
> 
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
> ---
> 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;

I think NFSv4.1 migration is supported well enough now
that the CONFIG_NFS_V4_1_MIGRATION configuration option
might be removed, leaving SUPP_MOVED_MIGR asserted all
the time.


--
Chuck Lever



--
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 mbox

Patch

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;